diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-17 18:59:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-17 18:59:01 -0800 |
| commit | 6fe7144104cd8b5bd9c7d215f76afdeafe13b7ee (patch) | |
| tree | c4f7f5d9b0f03c5beae32ca0f234d1fd4f4d326b /indra/newview/llconversationlog.h | |
| parent | 0e4c3070cb6cfb389d708ca459ed2c721c1cc28a (diff) | |
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
Diffstat (limited to 'indra/newview/llconversationlog.h')
| -rw-r--r-- | indra/newview/llconversationlog.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index 8f6ac3f5d1..35462ec3a4 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -141,7 +141,14 @@ public: private: LLConversationLog(); - + virtual ~LLConversationLog() + { + if (mAvatarNameCacheConnection.connected()) + { + mAvatarNameCacheConnection.disconnect(); + } + } + void enableLogging(bool enable); /** @@ -176,6 +183,7 @@ private: LLFriendObserver* mFriendObserver; // Observer of the LLAvatarTracker instance boost::signals2::connection newMessageSignalConnection; + boost::signals2::connection mAvatarNameCacheConnection; }; class LLConversationLogObserver |