From 9ebfaf511562da0641158c3dfca6d770be0a0ff5 Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Fri, 30 Oct 2009 21:02:58 +0200
Subject: Fixed normal bug EXT-2025 (Gesture btn causes nothing).

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 9065c6b3e8..9bf684f1fd 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -93,7 +93,7 @@
          min_width="76"
          name="gesture_panel"
          user_resize="false">
-		    <button
+		    <gesture_combo_box
 		      follows="right"
 		     height="23"
 		     label="Gesture"
-- 
cgit v1.2.3


From acdc82893440ac234144a3b4dc0cf1d927aad3d8 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 30 Oct 2009 21:07:09 +0200
Subject: repairing of textures.xml after merge 24e55f4a4c6.  YouAreHereBanner
 and ForSaleBanner texture was missed.

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 401f32c908..070766dff9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -442,6 +442,9 @@
 
   <!--WARNING OLD ART *do not use*-->
 
+ <texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
+  <texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
+
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
   <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
 
-- 
cgit v1.2.3