summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-17 15:50:51 -0700
committerRichard Linden <none@none>2011-03-17 15:50:51 -0700
commit5f05157fb74a6b3c1e20b024055e7fccf434c15c (patch)
treeac8aadb6ae827dab667ac65541cf577fbbb3086d /indra/newview/llviewermenu.cpp
parentd5c37e8b69cb39204d9c1f7e19a46a10c668b73a (diff)
SOCIAL-749 FIX Clicking on world to dismiss context menus causes your avatar to walk to click
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 75cf2efc69..3e0363849b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7158,7 +7158,13 @@ LLViewerMenuHolderGL::LLViewerMenuHolderGL(const LLViewerMenuHolderGL::Params& p
BOOL LLViewerMenuHolderGL::hideMenus()
{
- BOOL handled = LLMenuHolderGL::hideMenus();
+ BOOL handled = FALSE;
+
+ if (LLMenuHolderGL::hideMenus())
+ {
+ LLToolPie::instance().blockClickToWalk();
+ handled = TRUE;
+ }
// drop pie menu selection
mParcelSelection = NULL;