Created my own version of Emerald's chat channel tool

3 files changed, 22 insertions, 10 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 100c455..dd66a83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -59,10 +59,14 @@
                         <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                              tab_group="1" top="25">
         <string name="gesture_label">Gestures</string>
+        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
+             increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
+             max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+             width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 464ecac..ac3a74a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -8,13 +8,17 @@
         <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
              label="Local Chat" left="7" name="History"
              tool_tip="Click here to see what has been said" width="93" />
+  <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 
+                         increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
+                         max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+                         width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
              follows="left|right|bottom" font="SansSerif"
              handle_edit_keys_directly="false" height="20" label="Click here to chat."
-             left="107" max_length="254" name="Chat Editor"
+             left="212" max_length="254" name="Chat Editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
+             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="5" />
+        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="4"
              list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
              width="80">
                 <flyout_button_item value="shout" name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 24753d1..0704666 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -131,30 +131,34 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Close chat bar after hitting return" left="148" mouse_opaque="true"
              name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Arrow keys always move avatar when chatting" left="148"
              mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
              width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false" control_name="ChatChannelSelect"
+       label="Show custom chat channel" left="148" mouse_opaque="true"
+             name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box7" v_pad="0" width="128">
                 Bubble Chat:
         </text>
-        <check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
+        <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show chat bubbles" left="148" mouse_opaque="true"
              name="bubble_text_chat" radio_style="false" width="237" />
-        <slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
+        <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
              decimal_digits="3" enabled="true" follows="left|top" height="12"
              increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"