diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
| commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
| tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llcallingcard.cpp | |
| parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
| -rwxr-xr-x | indra/newview/llcallingcard.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 14583e402d..91741c2a77 100755 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -115,7 +115,9 @@ LLAvatarTracker::~LLAvatarTracker() { deleteTrackingData(); std::for_each(mObservers.begin(), mObservers.end(), DeletePointer()); + mObservers.clear(); std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer()); + mBuddyInfo.clear(); } void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name) |