diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 3166685e2..22d05991f 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -647,7 +647,7 @@ private: LLUUID mSessionID; }; -BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray& ids) +bool LLFloaterIMPanel::inviteToSession(const LLDynamicArray& ids) { LLViewerRegion* region = gAgent.getRegion(); if (!region) diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 0d80fe6e0..bee650d7b 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -108,6 +108,13 @@ public: //callbacks for P2P muting and volume control void onClickMuteVoice(); + enum SType + { + P2P_SESSION, + GROUP_SESSION, + ADHOC_SESSION + }; + const SType& getSessionType() const { return mSessionType; } const LLUUID& getSessionID() const { return mSessionUUID; } void processSessionUpdate(const LLSD& update); LLVoiceChannel* getVoiceChannel() { return mVoiceChannel; } @@ -174,12 +181,6 @@ private: // Where does the "Starting session..." line start? S32 mSessionStartMsgPos; - enum SType - { - P2P_SESSION, - GROUP_SESSION, - ADHOC_SESSION - }; SType mSessionType; // The value of the mSessionUUID depends on how the IM session was started: diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index fbecc880f..d31d5366c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2938,7 +2938,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) ) { - switch (pIMFloater->mSessionType) + switch (pIMFloater->getSessionType()) { case LLFloaterIMPanel::GROUP_SESSION: // Group chat if ( (from_id != gAgent.getID()) && (!gRlvHandler.canReceiveIM(session_id)) )