From 11b5e2fbccfe160e8b1d3518c007ce5db622358c Mon Sep 17 00:00:00 2001
From: Selo <none@none>
Date: Fri, 30 Sep 2011 17:37:53 +0200
Subject: [PATCH] Possible fix for FIRE-2012 - Fixed Ad-Hoc and Group
 Conference (need testing)

---
 indra/newview/llimfloater.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 5152edf11b..1c5075574f 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -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);
 }