summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-06 20:34:38 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-06 20:34:38 -0700
commit2ffd7aad9fa04b910e5079e59b75330fcfa8beab (patch)
tree6cc704ab6c32c40c017c03d3ba1e1b6f081f2fb9 /indra/newview
parent54bfe1c3e6e09e2733b7f9cd13dd6f39579b8168 (diff)
parent862a951880a8dfb2096b8bb88842f427d3c5f152 (diff)
Rolling back 28f52b3d2e3d : optimizations in button rendering
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerwindow.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 43d18c6d83..0a3a8993ec 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2486,6 +2486,17 @@ void LLViewerWindow::updateUI()
// only update mouse hover set when UI is visible (since we shouldn't send hover events to invisible UI
if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
{
+ // include all ancestors of captor_view as automatically having mouse
+ if (captor_view)
+ {
+ LLView* captor_parent_view = captor_view->getParent();
+ while(captor_parent_view)
+ {
+ mouse_hover_set.insert(captor_parent_view->getHandle());
+ captor_parent_view = captor_parent_view->getParent();
+ }
+ }
+
// aggregate visible views that contain mouse cursor in display order
LLPopupView::popup_list_t popups = mPopupView->getCurrentPopups();