diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-09 15:06:33 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-09 15:06:33 -0700 |
| commit | 4869e0c269deafa44874a0110cc1f06bdc310407 (patch) | |
| tree | 3e8930e92ebb7d8eb7997c89d198d30eaafe6c2e /indra/newview/llimconversation.h | |
| parent | 6df8c2b42066efad4d46a601ecaabbc9bf1dcd91 (diff) | |
| parent | 42dbf23dc56e0ab6842dd14b5701ffdb359f8bb6 (diff) | |
Pull merge richard/viewer-chui
Diffstat (limited to 'indra/newview/llimconversation.h')
| -rw-r--r-- | indra/newview/llimconversation.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h index 26151ad1be..50feb12aed 100644 --- a/indra/newview/llimconversation.h +++ b/indra/newview/llimconversation.h @@ -33,6 +33,7 @@ #include "lltransientdockablefloater.h" #include "llviewercontrol.h" #include "lleventtimer.h" +#include "llimview.h" #include "llconversationmodel.h" class LLPanelChatControlPanel; @@ -87,9 +88,6 @@ protected: // refresh a visual state of the Call button void updateCallBtnState(bool callIsActive); - // set the enable/disable state for the Call button - virtual void enableDisableCallBtn() = 0; - void buildParticipantList(); void onSortMenuItemClicked(const LLSD& userdata); @@ -99,9 +97,18 @@ protected: /// Update floater header and toolbar buttons when hosted/torn off state is toggled. void updateHeaderAndToolbar(); + // set the enable/disable state for the Call button + virtual void enableDisableCallBtn(); + + // process focus events to set a currently active session + /* virtual */ void onFocusLost(); + /* virtual */ void onFocusReceived(); + bool mIsNearbyChat; bool mIsP2PChat; + LLIMModel::LLIMSession* mSession; + LLLayoutPanel* mParticipantListPanel; LLParticipantList* mParticipantList; LLUUID mSessionID; @@ -119,7 +126,6 @@ private: /// Refreshes the floater at a constant rate. virtual void refresh() = 0; - /** * Adjusts chat history height to fit vertically with input chat field * and avoid overlapping, since input chat field can be vertically expanded. |