diff options
| author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
| commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
| tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llviewermenufile.cpp | |
| parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
| parent | 82ae214f6a367e17dd335e80e2444cf672108821 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rwxr-xr-x | indra/newview/llviewermenufile.cpp | 2 |
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; } }; |