From 795ae760e8b81a4e1b0ae4666d94d80919305189 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 27 Sep 2011 10:12:48 -0700
Subject: adding missing xml file

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
new file mode 100644
index 0000000000..d0059b281e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="60"
+ layout="topleft"
+ legacy_header_height="20"
+ title="Nearby chat"
+ can_close="true"
+ can_minimize="true"
+ help_topic="chat_bar"
+ save_rect="true"
+ min_height="60"
+ min_width="150"
+ can_resize="true"
+ name="chat_bar"
+ width="380">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="23"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     max_length_bytes="1023"
+     name="chat_box"
+     text_pad_left="5"
+     text_pad_right="25"
+     tool_tip="Press Enter to say, Ctrl+Enter to shout"
+     top="27"
+     width="335" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     height="16"
+     layout="topleft"
+     left_pad="-24"
+     mouse_opaque="true"
+     name="chat_zone_indicator"
+     top="31"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     is_toggle="true"
+     width="20"
+     top="27"
+     layout="topleft"
+     left_pad="12"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_On"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Selected"
+     height="23"
+     name="show_nearby_chat"
+     tool_tip="Shows/hides nearby chat log">
+        <button.init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="nearby_chat" />
+    </button>
+</floater>
-- 
cgit v1.2.3


From b6feeea2b550b981dbb04558902020e8cae16f7b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 27 Sep 2011 12:40:06 -0700
Subject: * Updated toybox to center bottom button and add delimeter

---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 60a39b0bff..092eddaa53 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -46,6 +46,7 @@
   <toolbar
     bottom="395"
     button_display_mode="icons_with_text"
+    follows="all"
     left="20"
     max_button_width="140"
     min_button_width="70"
@@ -58,15 +59,22 @@
     read_only="true"
     right="-20"
     side="top"
-    top="85">
-  </toolbar>
+    top="85" />
+  <panel
+    bevel_style="none"
+    border="true"
+    bottom="396"
+    follows="left|bottom|right"
+    left="20"
+    right="-20"
+    top="396" />
   <button
-    follows="left|bottom"
+    follows="left|bottom|right"
     height="23"
     label="Restore defaults"
     label_selected="Restore defaults"
     layout="topleft"
-    left="20"
+    left="260"
     name="btn_restore_defaults"
     top="415"
     width="130">
-- 
cgit v1.2.3