1 files changed, 41 insertions, 13 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index f422f33..3a3f51b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -61,6 +61,7 @@
 #include "llviewerwindow.h"
 #include "llviewerdisplay.h"
 #include "llviewermedia.h"
+#include "llv4math.h"           // for LL_VECTORIZE
 #include "llviewerparcelmedia.h"
 #include "llviewermediafocus.h"
 #include "llviewermessage.h"
@@ -1193,6 +1194,19 @@ bool LLAppViewer::cleanup()
 
         llinfos << "Viewer disconnected" << llendflush;
 
+        if (!mQuitRequested)                    //not doing it on quit, because the quitting voiceclient
+        {                                       //*might* crash imprudence TODO: fix the voiceclient instead
+                //this deletes all your buddies
+                LLAvatarTracker::instance().reset();
+                // reset group data. Blame LL for the need to clear a member variable through a global
+                LLGroupMgr::getInstance()->clearGroups();
+                gAgent.mGroups.clear();
+        }
+
+        //reset balance for not playing the UI-Sound 
+        //when relogging into another account 
+        gStatusBar->clearBalance();
+
         if (mQuitRequested)
         {
                 display_cleanup();
@@ -1473,8 +1487,11 @@ bool LLAppViewer::cleanup()
                 pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
                 pending += LLVFSThread::updateClass(0);
                 pending += LLLFSThread::updateClass(0);
-                F64 idle_time = idleTimer.getElapsedTimeF64();
-                if (!pending || idle_time >= max_idle_time)
+                if (pending == 0)
+                {
+                        break;
+                }
+                if (idleTimer.getElapsedTimeF64() >= max_idle_time)
                 {
                         llwarns << "Quitting with pending background tasks." << llendl;
                         break;
@@ -3740,10 +3757,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)
@@ -3751,6 +3776,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)
@@ -3767,13 +3799,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;
 
@@ -4167,9 +4193,10 @@ void LLAppViewer::resumeMainloopTimeout(const std::string& state, F32 secs)
         {
                 if(secs < 0.0f)
                 {
-                        secs = gSavedSettings.getF32("MainloopTimeoutDefault");
+                        static F32 *sMainloopTimeoutDefault = rebind_llcontrol<F32>("MainloopTimeoutDefault", &gSavedSettings, true);
+                        secs = *sMainloopTimeoutDefault;
                 }
-                
+
                 mMainloopTimeout->setTimeout(secs);
                 mMainloopTimeout->start(state);
         }
@@ -4194,7 +4221,8 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
         {
                 if(secs < 0.0f)
                 {
-                        secs = gSavedSettings.getF32("MainloopTimeoutDefault");
+                        static F32 *sMainloopTimeoutDefault = rebind_llcontrol<F32>("MainloopTimeoutDefault", &gSavedSettings, true);
+                        secs = *sMainloopTimeoutDefault;
                 }
 
                 mMainloopTimeout->setTimeout(secs);