diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-08-08 16:28:07 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-08-08 16:28:07 +0300 |
| commit | 0092e8c32d8cca4c9eb9983014f5e7a8d8d4ea9b (patch) | |
| tree | 537909b8464f71c193dd460f3e5b629579f0ab50 /indra/newview | |
| parent | 1341d591e3b9183de8568e7be81f7e2f4146727f (diff) | |
MAINT-1334 FIXED Enable "Close all windows" menu item if Snapshot floater is opened. Close Snapshot floater by close all command.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index dc2ea4bd1f..f791d906e6 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -494,7 +494,7 @@ class LLFileEnableCloseAllWindows : public view_listener_t { bool handleEvent(const LLSD& userdata) { - bool open_children = gFloaterView->allChildrenClosed(); + bool open_children = gFloaterView->allChildrenClosed() && !LLFloaterSnapshot::getInstance()->isInVisibleChain(); return !open_children; } }; @@ -505,7 +505,7 @@ class LLFileCloseAllWindows : public view_listener_t { bool app_quitting = false; gFloaterView->closeAllChildren(app_quitting); - + LLFloaterSnapshot::getInstance()->closeFloater(app_quitting); return true; } }; |