summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-12-11 15:34:40 +0200
committerandreykproductengine <akleshchev@productengine.com>2014-12-11 15:34:40 +0200
commit45167dba2efb1ebb88bba923f7fe16e698c20a5a (patch)
tree621ed8d21e162054402b06b59371266701021efc /indra
parent015e979632eb1e9d68ee09ad58f937f2523c2a23 (diff)
MAINT-4740 FIXED Context menus left on screen when closing floater with Ctrl+W
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewermenufile.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index b2a37694fe..f8e50ba463 100755
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -503,6 +503,7 @@ class LLFileCloseWindow : public view_listener_t
{
LLFloater::closeFrontmostFloater();
}
+ if (gMenuHolder) gMenuHolder->hideMenus();
return true;
}
};
@@ -525,6 +526,7 @@ class LLFileCloseAllWindows : public view_listener_t
bool app_quitting = false;
gFloaterView->closeAllChildren(app_quitting);
LLFloaterSnapshot::getInstance()->closeFloater(app_quitting);
+ if (gMenuHolder) gMenuHolder->hideMenus();
return true;
}
};