From a395edd9a08406526a09dcda6e14d3d3c9542985 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 29 Dec 2009 17:00:41 +0200
Subject: (EXT-3356) Dock Voice control panel to Speak button chevron, not to
 middle of Speak button. - Renamed Speak button parts in XML to avoid widget
 names confusion.

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

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 651dac6635..334bdd14b4 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -154,7 +154,7 @@ BOOL LLCallFloater::postBuild()
 	mNonAvatarCaller = getChild<LLNonAvatarCaller>("non_avatar_caller");
 	mNonAvatarCaller->setVisible(FALSE);
 
-	LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("right");
+	LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_flyout_btn");
 
 	setDockControl(new LLDockControl(
 		anchor_panel, this,
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 7781bdd066..68cf082c35 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -11,14 +11,14 @@
                  image_unselected="SegmentedBtn_Left_Off"
 		 image_pressed="SegmentedBtn_Left_Selected_Press"
 		 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-    name="left"
+    name="speak_btn"
     label="Speak"
     label_selected="Speak"
     tab_stop="false"
     />
   <show_button
     follows="right" 
-    name="right"
+    name="speak_flyout_btn"
     label=""
     left="0"
     top="0"
-- 
cgit v1.2.3