summaryrefslogtreecommitdiff
path: root/indra/newview/llpopupview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
commit9fbe736774b1049265fd017bfe2413d436d35706 (patch)
tree2077c5ced76eed3d14c3340a9645306e99434bbb /indra/newview/llpopupview.cpp
parent103083b52def07c140dfc8f28989b5f4a93d288a (diff)
parent0a80627bca63ee05ce07df510ebe2072399dd01d (diff)
(slightly hairy) merge from viewer-hotfix
Diffstat (limited to 'indra/newview/llpopupview.cpp')
-rw-r--r--indra/newview/llpopupview.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index 7cde350d5a..4523bf2ba4 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -116,7 +116,6 @@ BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func
if (!popup
|| !predicate(popup))
{
- ++popup_it;
continue;
}