diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-21 16:40:52 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-21 16:40:52 +0300 |
| commit | 695ca70b2b22e16f932afe0ecddbe72a3ff92af1 (patch) | |
| tree | 8c228dc970dc064cdea792e8cb321c95fbe3041d /indra/newview/llchicletbar.h | |
| parent | c8857cc72270479ed3a5a04b14be3361b2eafea9 (diff) | |
| parent | fd247320ceab3ab6dc6abdf17008618cf3f6a8ff (diff) | |
Merge
Diffstat (limited to 'indra/newview/llchicletbar.h')
| -rw-r--r-- | indra/newview/llchicletbar.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h index 1427bf95e0..7d0d904810 100644 --- a/indra/newview/llchicletbar.h +++ b/indra/newview/llchicletbar.h @@ -50,9 +50,10 @@ public: LLChicletPanel* getChicletPanel() { return mChicletPanel; } // LLIMSessionObserver observe triggers - virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id); - virtual void sessionRemoved(const LLUUID& session_id); - void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); + /*virtual*/ void sessionAdded(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); + /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); S32 getTotalUnreadIMCount(); |