Merge remote branch 'armin/weekly' into weekly

6 files changed, 44 insertions, 11 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e6b4831..2496d13 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1185,6 +1185,16 @@ 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 balance for not playing the UI-Sound 
+        //when relogging into another account 
+        gStatusBar->clearBalance();
+
         if (mQuitRequested)
         {
                 display_cleanup();
@@ -3722,10 +3732,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)
@@ -3733,6 +3751,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)
@@ -3749,13 +3774,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;
 
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 155fb60..15be0eb 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -137,8 +137,20 @@ LLAvatarTracker::~LLAvatarTracker()
         deleteTrackingData();
         std::for_each(mObservers.begin(), mObservers.end(), DeletePointer());
         std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
+        mObservers.erase(mObservers.begin(), mObservers.end());
+        mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
 }
 
+
+void LLAvatarTracker::reset()
+{
+    std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
+        mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
+        mModifyMask |= LLFriendObserver::REMOVE;
+        notifyObservers();
+}
+
+
 void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name)
 {
         deleteTrackingData();
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 0db5376..d3f53c6 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -86,7 +86,7 @@ class LLAvatarTracker
 {
 public:
         static LLAvatarTracker& instance() { return sInstance; }
-        
+        void reset();
         void track(const LLUUID& avatar_id, const std::string& name);
         void untrack(const LLUUID& avatar_id);
         bool isTrackedAgentValid() { return mTrackedAgentValid; }
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index 07723e0..5096495 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -192,7 +192,7 @@ BOOL LLFloaterBuyCurrencyUI::canClose()
 void LLFloaterBuyCurrencyUI::onClose(bool app_quitting)
 {
         LLFloater::onClose(app_quitting);
-        destroy();
+
 }
 
 void LLFloaterBuyCurrencyUI::updateUI()
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index 92be319..9ed067f 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -121,7 +121,8 @@ public:
         S32 getSquareMetersCommitted() const;
         S32 getSquareMetersLeft() const;
         LLRegionDetails mRegionDetails;
-
+        
+        void clearBalance() { mBalance = 0; }
 private:
         static void onCommitSearch(LLUICtrl*, void* data);
         static void onClickSearch(void* data);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e109673..7526944 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1560,6 +1560,7 @@ void cleanup_menus()
 {
         LL_DEBUGS("AFK") << "cleanup_menus start" << LL_ENDL;
         sMenus.clear();
+        LLMenuGL::sMenuContainer = NULL;
 
         delete gMenuParcelObserver;
         gMenuParcelObserver = NULL;