summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2009-07-09 22:54:57 +0000
committerLeyla Farazha <leyla@lindenlab.com>2009-07-09 22:54:57 +0000
commite8bc8264f96d179cccf7cd09de774dd7fb50bc46 (patch)
treedcb2ca73965b01d6afc10269eff255936fd15228 /indra
parentd5211482b2506798212a462becfb298c54bc2bfc (diff)
merge fix for bottom tray history button
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml5
1 files changed, 5 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 71cc789038..6c4f47a34f 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -53,8 +53,13 @@
layout="topleft"
left="0"
name="chat_box"
+ right="-39"
top="3"
width="250" />
+ <button follows="right" width="36" top="3" left="214" resize="false"
+ label="Hx" height="20">
+ <button.commit_callback function="Floater.Toggle" parameter="chat"/>
+ </button>
</layout_panel>
<icon
auto_resize="false"