diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 12:23:15 -0700 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 12:23:15 -0700 |
commit | a46d4ada3a2fe9ed8e5279e7d7e20d1ca485482c (patch) | |
tree | 3472c567b099034ee8ea13d34ccf89b41a6daccf /indra/newview/llchiclet.h | |
parent | 0ca59987843cfcaedb12592b9466567ef421c4e8 (diff) | |
parent | 5a22949cf509ebd1a3c7dfbd029b4bc188fee4a3 (diff) |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llchiclet.h')
-rw-r--r-- | indra/newview/llchiclet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index f51d7b622c..6395f5b694 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -874,6 +874,7 @@ class LLIMWellChiclet : public LLSysWellChiclet, LLIMSessionObserver friend class LLUICtrlFactory; public: /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {} + /*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {} /*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id) {}; /*virtual*/ void sessionRemoved(const LLUUID& session_id) { messageCountChanged(LLSD()); } /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) {} |