summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-08 15:32:46 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-08 15:32:46 +0300
commit07d34b9692355acf687788aeaf7055c720b25291 (patch)
tree1524f50b66ea532fe96c4feda87a18e79452c40c /indra/newview/skins/default/xui
parent7709fa2f8360a442d4017a78e8fd36051efa6d55 (diff)
parentdee74f53dcd65922ffe6528a305b6c00e77976bf (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index c34a367c32..c6ca814f58 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -127,6 +127,8 @@
<gesture_combo_list.combo_button
pad_right="10"
use_ellipses="true" />
+ <gesture_combo_list.combo_list
+ page_lines="17" />
</gesture_combo_list>
</layout_panel>
<icon