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/llimfloatercontainer.h | |
| parent | c8857cc72270479ed3a5a04b14be3361b2eafea9 (diff) | |
| parent | fd247320ceab3ab6dc6abdf17008618cf3f6a8ff (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 10268a5d79..3d1324c2fb 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -30,6 +30,7 @@ #include <map> #include <vector> +#include "llimview.h" #include "llfloater.h" #include "llmultifloater.h" #include "llavatarpropertiesprocessor.h" @@ -117,7 +118,9 @@ private: }; // CHUI-137 : End -class LLIMFloaterContainer : public LLMultiFloater +class LLIMFloaterContainer + : public LLMultiFloater + , public LLIMSessionObserver { public: LLIMFloaterContainer(const LLSD& seed); @@ -143,6 +146,12 @@ public: void collapseMessagesPane(bool collapse); + // LLIMSessionObserver observe triggers + /*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) {}; + private: typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t; avatarID_panel_map_t mSessions; |