summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-14 11:46:38 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-14 11:46:38 -0700
commitaa7245fa2b5441285d2de384a9629782456af88a (patch)
tree11c5bb7adbd3f4d0ef28497f0d583fdedbad74d4
parent7c37132bf87c0c2bf8d7d7f2b6f8624c5160e9e8 (diff)
EXP-1361 FIX -- Repositioning Viewer Window on mac triggers click to walk
* Mouse clicks outside the root view are now discarded before they can cause problems. Reviewed by Richard
-rw-r--r--indra/newview/llviewerwindow.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b8715bfa5b..0873e4f6ea 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -938,6 +938,11 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK
// }
//}
+ // Mark the click as handled and return if we aren't within the root view to avoid spurious bugs
+ if( !mRootView->pointInView(x, y) )
+ {
+ return TRUE;
+ }
// Give the UI views a chance to process the click
if( mRootView->handleAnyMouseClick(x, y, mask, clicktype, down) )
{