fix: Bug #390 Logout: snapshot window doesn't close when logging out

1 files changed, 17 insertions, 8 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 18df447..7d9acf4 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3729,10 +3729,18 @@ void LLAppViewer::idleShutdown()
         else
         {
                 mQuitRequested=true;
-//awfixme
                 forceQuit();
         }
 
+
+        static bool saved_snapshot = false;
+        if (!saved_snapshot)
+        {
+                saved_snapshot = true;
+                saveFinalSnapshot();
+                return;
+        }
+
         // Attempt to close all floaters that might be
         // editing things.
         if (gFloaterView)
@@ -3740,6 +3748,13 @@ void LLAppViewer::idleShutdown()
                 // application is quitting
                 gFloaterView->closeAllChildren(true);
         }
+        
+        // extra invitation to the Snapshot Floater 
+        // not to show on the loginscreen when relogging
+        if (gSnapshotFloaterView)
+        {
+                gSnapshotFloaterView->closeAllChildren(true);
+        }
 
         // close IM interface
         if(gIMMgr)
@@ -3756,13 +3771,7 @@ void LLAppViewer::idleShutdown()
                 return;
         }
 
-        static bool saved_snapshot = false;
-        if (!saved_snapshot)
-        {
-                saved_snapshot = true;
-                saveFinalSnapshot();
-                return;
-        }
+
 
         const F32 SHUTDOWN_UPLOAD_SAVE_TIME = 5.f;