aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-12 17:01:20 -0700
committerMcCabe Maxsted2010-08-26 11:20:57 -0700
commit0d5eb3b8e5f9cbd1a851e23df5cc462de73f06ef (patch)
treeb86d60a42450da872d14745a65d567c5aaefa034 /linden/indra/newview/llcallingcard.cpp
parentCommented out unused .config files from viewer_manifest.py and made sure it u... (diff)
downloadmeta-impy-0d5eb3b8e5f9cbd1a851e23df5cc462de73f06ef.zip
meta-impy-0d5eb3b8e5f9cbd1a851e23df5cc462de73f06ef.tar.gz
meta-impy-0d5eb3b8e5f9cbd1a851e23df5cc462de73f06ef.tar.bz2
meta-impy-0d5eb3b8e5f9cbd1a851e23df5cc462de73f06ef.tar.xz
Fixed #381: using voice causes viewer crash on disconnect/quit
Diffstat (limited to 'linden/indra/newview/llcallingcard.cpp')
-rw-r--r--linden/indra/newview/llcallingcard.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index d5211d7..db28c7a 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -137,20 +137,8 @@ LLAvatarTracker::~LLAvatarTracker()
137 deleteTrackingData(); 137 deleteTrackingData();
138 std::for_each(mObservers.begin(), mObservers.end(), DeletePointer()); 138 std::for_each(mObservers.begin(), mObservers.end(), DeletePointer());
139 std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer()); 139 std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
140 mObservers.erase(mObservers.begin(), mObservers.end());
141 mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
142} 140}
143 141
144
145void LLAvatarTracker::reset()
146{
147 std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
148 mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
149 mModifyMask |= LLFriendObserver::REMOVE;
150 notifyObservers();
151}
152
153
154void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name) 142void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name)
155{ 143{
156 deleteTrackingData(); 144 deleteTrackingData();