1 files changed, 14 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 97b11fd..13ff55c 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -52,7 +52,8 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
-#include "viewer.h"     // app_request_quit()
+#include "llappviewer.h"
+
 
 // linden libraries
 #include "llassetuploadresponders.h"
@@ -347,6 +348,16 @@ class LLFileCloseWindow : public view_listener_t
         }
 };
 
+class LLFileEnableCloseAllWindows : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool open_children = gFloaterView->allChildrenClosed();
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(!open_children);
+                return true;
+        }
+};
+
 class LLFileCloseAllWindows : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -439,7 +450,7 @@ class LLFileQuit : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                app_user_quit();
+                LLAppViewer::instance()->userQuit();
                 return true;
         }
 };
@@ -1035,6 +1046,7 @@ void init_menu_file()
         (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
         (new LLFileCloseAllWindows())->registerListener(gMenuHolder, "File.CloseAllWindows");
         (new LLFileEnableCloseWindow())->registerListener(gMenuHolder, "File.EnableCloseWindow");
+        (new LLFileEnableCloseAllWindows())->registerListener(gMenuHolder, "File.EnableCloseAllWindows");
         (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
         (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
         (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");