diff options
| author | Richard Linden <none@none> | 2010-09-09 17:19:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-09 17:19:33 -0700 |
| commit | 6c2c87e8b96edf0b5c222b355b39915827ec7fda (patch) | |
| tree | 2b20dcfa2f1ad12672e29c00770fb59e87ece3e2 /indra/newview | |
| parent | 9f75ae5e327c2802a901b1afd6ce3deb77212181 (diff) | |
| parent | 30f2987b0a2d4a0586ed8893a43d97274bd29500 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 7459e72646..4bb4525a46 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2490,6 +2490,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(); |