diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-09 16:48:33 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-09 16:48:33 +0300 |
| commit | 6cf49a4a715c9f498d4b063f8d74e295be1f418c (patch) | |
| tree | 25031d63658434e1a70b29b6c06c0302831605bf /indra/newview/llimfloatercontainer.h | |
| parent | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (diff) | |
CHUI-171 WIP (Conversation not automatically readded to conversation window listing when open) - removal of the dependence between items of the conversations list and conversation's floaters.
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 161c6d9806..d6dda8ea2d 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -35,6 +35,7 @@ #include "llmultifloater.h" #include "llavatarpropertiesprocessor.h" #include "llgroupmgr.h" +#include "lltrans.h" #include "llconversationmodel.h" class LLButton; @@ -75,10 +76,11 @@ public: // LLIMSessionObserver observe triggers - /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_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) {}; + /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); + LLConversationViewModel& getRootViewModel() { return mConversationViewModel; } private: @@ -107,9 +109,9 @@ private: // Conversation list implementation public: - void removeConversationListItem(LLFloater* floaterp, bool change_focus = true); - void addConversationListItem(std::string name, const LLUUID& uuid, LLFloater* floaterp); - LLFloater* findConversationItem(LLUUID& uuid); + void removeConversationListItem(const LLUUID& uuid, bool change_focus = true); + void addConversationListItem(const LLUUID& uuid); + private: LLFolderViewItem* createConversationItemWidget(LLConversationItem* item); |