diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-03 13:54:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-03 13:54:35 -0700 |
| commit | d6d35d970f3a7b4db7e29f7d2eddb0c078cba4a5 (patch) | |
| tree | 18b02f063987e9a6b80036307990802ce0c84d0e /indra/newview/llconversationlog.h | |
| parent | 0fa1e2b9ae41bb06e5c7db90900d4f469f44b8d3 (diff) | |
CHUI-263 : Fix crash on exit. LLSingleton like LLConversationLog cannot be an LLFriendObserver at the same time.
Diffstat (limited to 'indra/newview/llconversationlog.h')
| -rw-r--r-- | indra/newview/llconversationlog.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index 18865bb80e..a7457d55e3 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -99,7 +99,7 @@ private: * To distinguish two conversations with the same sessionID it's also needed to compare their creation date. */ -class LLConversationLog : public LLSingleton<LLConversationLog>, LLIMSessionObserver, LLFriendObserver +class LLConversationLog : public LLSingleton<LLConversationLog>, LLIMSessionObserver { friend class LLSingleton<LLConversationLog>; public: @@ -126,8 +126,8 @@ public: virtual void sessionRemoved(const LLUUID& session_id){} // Stub virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id){} // Stub - // LLFriendObserver trigger - virtual void changed(U32 mask); + // Triggered by LLFriendObserver change + void notifyObservers(); /** * public method which is called on viewer exit to save conversation log @@ -137,7 +137,6 @@ public: private: LLConversationLog(); - void notifyObservers(); /** * constructs file name in which conversations log will be saved @@ -152,6 +151,8 @@ private: typedef std::vector<LLConversation> conversations_vec_t; std::vector<LLConversation> mConversations; std::set<LLConversationLogObserver*> mObservers; + + LLFriendObserver* mFriendObserver; // Observer of the LLAvatarTracker instance }; class LLConversationLogObserver |