summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-09-27 20:00:27 -0700
committerMerov Linden <merov@lindenlab.com>2011-09-27 20:00:27 -0700
commitd11cc7bf46bc12afa3394544840ee26a4d0d9b18 (patch)
tree080e1bbef8d228c8541c901a1f5866d4a8c06e68 /indra/newview/skins/default/xui
parent1bdfe7ec471efb94acc4a8f98e8084c08199c9da (diff)
parent78eb989e50e7f91298294d34a743f8ac0e3dcce1 (diff)
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_toolbar.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index fbfbe51a69..067c1fed82 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -8,6 +8,7 @@
translate="false"
width="500">
<toolbar name="test_toolbar_top"
+ button_display_mode="icons_with_text"
follows="left|right|top"
height="50"
width="500"
@@ -21,6 +22,7 @@
<command name="chat"/>
</toolbar>
<toolbar name="test_toolbar_left"
+ button_display_mode="icons_with_text"
follows="left|bottom|top"
height="380"
width="200"
@@ -33,6 +35,7 @@
<command name="chat"/>
</toolbar>
<toolbar name="test_toolbar_right"
+ button_display_mode="icons_with_text"
follows="right|bottom|top"
height="380"
width="200"
@@ -44,6 +47,7 @@
<command name="chat"/>
</toolbar>
<toolbar name="test_toolbar_bottom"
+ button_display_mode="icons_with_text"
follows="left|right|bottom"
height="50"
width="500"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 7a176ff367..2b5e3143a4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -67,6 +67,8 @@
top="0"
orientation="vertical"
name="inbox_outbox_layout_stack"
+ open_time_constant="0.02"
+ close_time_constant="0.02"
height="235"
width="330">
<layout_panel