merge

--HG--
branch : product-engine

indra/newview/skins/default/textures/textures.xml

@@ -444,6 +444,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" />
 

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"