Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG-- branch : product-engine
2009-10-30 21:03:50 +02:00 · 2009-10-30 21:03:50 +02:00 · 72f6ccd137
parent 7912ce0bb3 9ebfaf5115
commit 72f6ccd137
1 changed files with 1 additions and 1 deletions
--- 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"