From e8bc8264f96d179cccf7cd09de774dd7fb50bc46 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 9 Jul 2009 22:54:57 +0000
Subject: merge fix for bottom tray history button

---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/skins/default/xui')

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"
-- 
cgit v1.2.3