diff options
| author | richard <none@none> | 2009-11-10 12:05:36 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-10 12:05:36 -0800 |
| commit | 595000c19c0499a0b612c272cd097a8f1ca578bd (patch) | |
| tree | dc88a193c3275b23bcc2efb1180ff5eb1e90fac9 /indra/newview/llpanelpeople.cpp | |
| parent | ecf8f5c5beda9f5fa743c4666717c4378f204023 (diff) | |
| parent | 1eaab29a95439c6688c903b224e660de0fc9a053 (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 0c66e7155c..a6083a5755 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); } |