Merge

1 files changed, 63 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..2b361c0628
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ default_tab_group="1"
+ follows="left|bottom|right"
+ height="25"
+ layout="topleft"
+ left="0"
+ name="chat_bar"
+ top="21"
+ width="310">
+    <string name="min_width">
+        188
+    </string>
+    <string name="max_width">
+        320
+    </string>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="23"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="3"
+     text_pad_right="25"
+     left="0"
+     max_length="512"
+     name="chat_box"
+     tool_tip="Press Enter to say, Ctrl+Enter to shout"
+     top="2"
+     width="283" />
+    <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="6"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     is_toggle="true"
+     width="20"
+     top="2"
+     layout="topleft"
+     left_pad="4"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_Up_On_Selected"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Up_On_Selected"
+     height="23"
+     name="show_nearby_chat"
+     tool_tip="Shows/hides nearby chat log">
+        <button.init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="nearby_chat" />
+    </button>
+</panel>