diff options
| author | richard <none@none> | 2009-11-09 16:14:52 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-09 16:14:52 -0800 |
| commit | 3b2d9f63e3a54660a8657ec573cce3f29f677047 (patch) | |
| tree | 2f51c9bc9a04a639ff3ac6851917f4f4df89bd0b /indra/newview/llpanelpeople.cpp | |
| parent | f4a7de3bb5a837df43525ac936000fd67177ea42 (diff) | |
| parent | 2bc97bd68a774dd373c5688b5dc660abe90b37cc (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index bb6cdd2f78..348742a974 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -198,7 +198,8 @@ public: ~LLFriendListUpdater() { - delete mInvObserver; + // will be deleted by ~LLInventoryModel + //delete mInvObserver; LLVoiceClient::getInstance()->removeObserver(this); LLAvatarTracker::instance().removeObserver(this); } |