summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Borushevsky <sborushevsky@productengine.com>2009-10-30 21:03:50 +0200
committerSergey Borushevsky <sborushevsky@productengine.com>2009-10-30 21:03:50 +0200
commit72f6ccd137c4581f731d435a308f0fa30ea29d6d (patch)
tree12f75f1395d672ae316ea38ab9169a48c987ae9c
parent7912ce0bb36ecd49de1012a676fb71873a4ac717 (diff)
parent9ebfaf511562da0641158c3dfca6d770be0a0ff5 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml2
1 files changed, 1 insertions, 1 deletions
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"