diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-05-17 19:35:05 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-05-17 19:35:05 +0300 |
| commit | 4fc8000d6692290516eae1f865b6b41f1d56cc0b (patch) | |
| tree | 850aba11c144a3176daa66ec4078ad0104143255 /indra/newview/llimfloater.h | |
| parent | f59aa880395d4b744c89b0a375b21ee2bf429625 (diff) | |
CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chat
Diffstat (limited to 'indra/newview/llimfloater.h')
| -rw-r--r-- | indra/newview/llimfloater.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 03f52fb316..4cbdaccea5 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -27,12 +27,13 @@ #ifndef LL_IMFLOATER_H #define LL_IMFLOATER_H +#include "llimview.h" #include "llinstantmessage.h" #include "lllogchat.h" #include "lltooldraganddrop.h" -#include "lltransientdockablefloater.h" #include "llvoicechannel.h" #include "llvoiceclient.h" +#include "lltransientdockablefloater.h" class LLAvatarName; class LLButton; @@ -47,7 +48,7 @@ class LLInventoryCategory; * optionally "docked" to the bottom tray. */ class LLIMFloater - : public LLTransientDockableFloater + : public LLTransientDockableFloater , public LLVoiceClientStatusObserver { LOG_CLASS(LLIMFloater); @@ -109,7 +110,7 @@ public: void processAgentListUpdates(const LLSD& body); void processSessionUpdate(const LLSD& session_update); - static void processChatHistoryStyleUpdate(const LLSD& newvalue); + static void processChatHistoryStyleUpdate(); BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, @@ -153,7 +154,7 @@ private: BOOL isInviteAllowed() const; BOOL inviteToSession(const uuid_vec_t& agent_ids); - + void appendMessage(const LLChat& chat, const LLSD &args = 0); static void onInputEditorFocusReceived( LLFocusableElement* caller,void* userdata ); static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata); static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata); @@ -186,11 +187,13 @@ private: LLPanelChatControlPanel* mControlPanel; LLUUID mSessionID; + LLIMModel::LLIMSession* mSession; S32 mLastMessageIndex; + LLChatHistory* mChatHistory; + EInstantMessage mDialog; LLUUID mOtherParticipantUUID; - LLChatHistory* mChatHistory; LLLineEditor* mInputEditor; bool mPositioned; @@ -199,6 +202,7 @@ private: bool mMeTyping; bool mOtherTyping; bool mShouldSendTypingState; + bool mIsP2PChat; LLFrameTimer mTypingTimer; LLFrameTimer mTypingTimeoutTimer; |