diff options
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
| -rw-r--r-- | indra/newview/llfloaterimsession.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h index e7fd6f9ff3..381b3cf721 100644 --- a/indra/newview/llfloaterimsession.h +++ b/indra/newview/llfloaterimsession.h @@ -69,6 +69,13 @@ public: /*virtual*/ BOOL getVisible(); // Check typing timeout timer. + /*virtual*/ void draw(); + /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, + EDragAndDropType cargo_type, + void* cargo_data, + EAcceptance* accept, + std::string& tooltip_msg); + static LLFloaterIMSession* findInstance(const LLUUID& session_id); static LLFloaterIMSession* getInstance(const LLUUID& session_id); @@ -117,13 +124,6 @@ public: void processAgentListUpdates(const LLSD& body); void processSessionUpdate(const LLSD& session_update); - /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - EAcceptance* accept, - std::string& tooltip_msg); - - //used as a callback on receiving new IM message static void sRemoveTypingIndicator(const LLSD& data); static void onIMChicletCreated(const LLUUID& session_id); @@ -189,6 +189,7 @@ private: LLSD mQueuedMsgsForInit; uuid_vec_t mInvitedParticipants; + uuid_vec_t mPendingParticipants; // connection to voice channel state change signal boost::signals2::connection mVoiceChannelStateChangeConnection; |