Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LLIMMgr/LLIMPanel Revision] Compile Fixies

Browse Source 
How did these even
This commit is contained in:
Inusaito Sayori
2013-10-10 17:01:18 -04:00
parent cf214e4f9e
commit 8964cfd58b
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimpanel.cpp
View File

@@ -647,7 +647,7 @@ private:
LLUUID mSessionID; LLUUID mSessionID;
}; };
BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids) bool LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
{ {
LLViewerRegion* region = gAgent.getRegion(); LLViewerRegion* region = gAgent.getRegion();
if (!region) if (!region)

13
indra/newview/llimpanel.h
View File

@@ -108,6 +108,13 @@ public:
//callbacks for P2P muting and volume control //callbacks for P2P muting and volume control
void onClickMuteVoice(); void onClickMuteVoice();
enum SType
{
P2P_SESSION,
GROUP_SESSION,
ADHOC_SESSION
};
const SType& getSessionType() const { return mSessionType; }
const LLUUID& getSessionID() const { return mSessionUUID; } const LLUUID& getSessionID() const { return mSessionUUID; }
void processSessionUpdate(const LLSD& update); void processSessionUpdate(const LLSD& update);
LLVoiceChannel* getVoiceChannel() { return mVoiceChannel; } LLVoiceChannel* getVoiceChannel() { return mVoiceChannel; }
@@ -174,12 +181,6 @@ private:
// Where does the "Starting session..." line start? // Where does the "Starting session..." line start?
S32 mSessionStartMsgPos; S32 mSessionStartMsgPos;
enum SType
{
P2P_SESSION,
GROUP_SESSION,
ADHOC_SESSION
};
SType mSessionType; SType mSessionType;
// The value of the mSessionUUID depends on how the IM session was started: // The value of the mSessionUUID depends on how the IM session was started:

2
indra/newview/llviewermessage.cpp
View File

@@ -2938,7 +2938,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) ) if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) )
{ {
switch (pIMFloater->mSessionType) switch (pIMFloater->getSessionType())
{ {
case LLFloaterIMPanel::GROUP_SESSION: // Group chat case LLFloaterIMPanel::GROUP_SESSION: // Group chat
if ( (from_id != gAgent.getID()) && (!gRlvHandler.canReceiveIM(session_id)) ) if ( (from_id != gAgent.getID()) && (!gRlvHandler.canReceiveIM(session_id)) )