livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-2012: Fix the call button in ad-hoc chats the correct way: Call updateCallButton() during sessionInitReplyReceived() for either group and ad-hoc, that will invoked if the session has been initialized

Ansariel 2014-09-07 01:31:45 +02:00
parent b0a04e1bbf
commit 726fd48a3f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/fsfloaterim.cpp
View File

@ -552,14 +552,11 @@ void FSFloaterIM::updateCallButton()
return;
}
//bool session_initialized = session->mSessionInitialized;
bool session_initialized = session->mSessionInitialized;
bool callback_enabled = session->mCallBackEnabled;
//[Possible FIX-FIRE-2012] GROUP and Ad-Hoc don't have session initialized --> removing that from the condition to enable_connect
//BOOL enable_connect = session_initialized
//&& voice_enabled
//&& callback_enabled;
BOOL enable_connect = voice_enabled
BOOL enable_connect = session_initialized
&& voice_enabled
&& callback_enabled;
getChild<LLButton>("call_btn")->setEnabled(enable_connect);
@ -1166,10 +1163,14 @@ void FSFloaterIM::sessionInitReplyReceived(const LLUUID& im_session_id)
mControlPanel->setSessionId(im_session_id);
}
// updating "Call" button from group control panel here to enable it without placing into draw() (EXT-4796)
if(gAgent.isInGroup(im_session_id))
// updating "Call" button from group/ad-hoc control panel here to enable it without placing into draw() (EXT-4796)
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(im_session_id);
if (session)
{
updateCallButton();
if ((session->isGroupSessionType() && gAgent.isInGroup(im_session_id)) || session->isAdHocSessionType())
{
updateCallButton();
}
}
//*TODO here we should remove "starting session..." warning message if we added it in postBuild() (IB)