From 09d6eeceb8367879c0ce158e20eae9732909596c Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 2 Dec 2009 10:41:53 +0200
Subject: Minor changes to EXT-2986 (Add "Leave Call" button in Voice Control
 Panel for all voice chats except nearby) implementation.

--HG--
branch : product-engine
---
 indra/newview/llcallfloater.cpp                               | 6 ++++--
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index d6ae4603b4..d82c088997 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -96,7 +96,9 @@ void LLCallFloater::leaveCall()
 {
 	LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel();
 	if (voice_channel && voice_channel->isActive())
+	{
 		voice_channel->deactivate();
+	}
 }
 
 void LLCallFloater::updateSession()
@@ -150,8 +152,8 @@ void LLCallFloater::updateSession()
 	updateTitle();
 	
 	//hide "Leave Call" button for nearby chat
-	bool isLocalChat = mVoiceType == VC_LOCAL_CHAT;
-	childSetVisible("leave_btn_panel", !isLocalChat);
+	bool is_local_chat = mVoiceType == VC_LOCAL_CHAT;
+	childSetVisible("leave_btn_panel", !is_local_chat);
 	
 	refreshPartisipantList();
 }
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c59d97457e..2652fae214 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -101,7 +101,6 @@
             </layout_panel>
             <layout_panel
              layout="topleft"
-             min_width="138" 
              name="volume_slider_panel"
              top="0"
              user_resize="false"
-- 
cgit v1.2.3