DRTVWR-589 - restore close_all_swindows()

1 files changed, 12 insertions, 6 deletions

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 17e89e1850..724f19c7d6 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -741,16 +741,22 @@ class LLFileEnableCloseAllWindows : public view_listener_t
 	}
 };
 
+void close_all_windows() 
+{
+    bool app_quitting = false;
+    gFloaterView->closeAllChildren(app_quitting);
+    LLFloaterSnapshot *floater_snapshot = LLFloaterSnapshot::findInstance();
+    if (floater_snapshot)
+        floater_snapshot->closeFloater(app_quitting);
+    if (gMenuHolder)
+        gMenuHolder->hideMenus();
+}
+
 class LLFileCloseAllWindows : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool app_quitting = false;
-		gFloaterView->closeAllChildren(app_quitting);
-		LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
-		if (floater_snapshot)
-			floater_snapshot->closeFloater(app_quitting);
-		if (gMenuHolder) gMenuHolder->hideMenus();
+		close_all_windows();
 		return true;
 	}
 };