From 0b8be887de8e801aa1f4bb1dc1d94c1ac5fd58ef Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 19 Feb 2010 19:51:07 +0200
Subject: Fixed low bug EXT-5568 (The Speak button label hides after bottom
 tray width decreased.)

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp                               | 11 +++++------
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 92031be8c5..17313fc113 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -926,13 +926,12 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_
 		}
 		else
 		{
-			//
-			mSpeakBtn->setLabelVisible(false);
 			S32 panel_width = mSpeakPanel->getRect().getWidth();
 			S32 possible_shrink_width = panel_width - panel_min_width;
 
 			if (possible_shrink_width > 0)
 			{
+				mSpeakBtn->setLabelVisible(false);
 				mSpeakPanel->reshape(panel_width - possible_shrink_width, mSpeakPanel->getRect().getHeight());
 
 				*required_width += possible_shrink_width;
@@ -1007,11 +1006,11 @@ void LLBottomTray::processExtendButtons(S32* available_width)
 
 	if (*available_width > 0)
 	{
-		processExtendButton(RS_BUTTON_CAMERA, available_width);
+		processExtendButton(RS_BUTTON_MOVEMENT, available_width);
 	}
 	if (*available_width > 0)
 	{
-		processExtendButton(RS_BUTTON_MOVEMENT, available_width);
+		processExtendButton(RS_BUTTON_CAMERA, available_width);
 	}
 	if (*available_width > 0)
 	{
@@ -1211,8 +1210,8 @@ bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible
 			if ( (available_width + possible_shrunk_width) >= minimal_width)
 			{
 				// There is enough space for minimal width, but set the result_width
-				// to current_width so buttons widths decreasing will be done in predefined order
-				result_width = current_width;
+				// to preferred_width so buttons widths decreasing will be done in predefined order
+				result_width = (preferred_width > 0) ? preferred_width : current_width;
 				decrease_width = true;
 			}
 			else
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 2b361c0628..088f098f85 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -9,7 +9,7 @@
  top="21"
  width="310">
     <string name="min_width">
-        188
+        216
     </string>
     <string name="max_width">
         320
-- 
cgit v1.2.3