Merge remote branch 'armin/weekly' into weekly

1 files changed, 12 insertions, 0 deletions

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();