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

Possible fix for FIRE-2012 - Fixed Ad-Hoc and Group Conference (need testing)

meow-7.2.2
Selo 2011-09-30 17:37:53 +02:00
parent 10fb2759b6
commit 11b5e2fbcc
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llimfloater.cpp
View File

@ -523,10 +523,26 @@ void LLIMFloater::updateCallButton()
bool session_initialized = session->mSessionInitialized;
bool callback_enabled = session->mCallBackEnabled;
BOOL enable_connect = session_initialized
&& voice_enabled
//[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
&& callback_enabled;
//if (voice_enabled)
//{
// llinfos << "LLIMFloater::updateCallButton - voice enabled" << llendl;
//}
//if (session_initialized)
//{
// llinfos << "LLIMFloater::updateCallButton - session_initialized" << llendl;
//}
//if (callback_enabled)
//{
// llinfos << "LLIMFloater::updateCallButton - callback_enabled" << llendl;
//}
getChild<LLButton>("call_btn")->setEnabled(enable_connect);
}