Added IM preference for showing IMs in either main or local chat

1 files changed, 46 insertions, 36 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index f0f79e4..ee00455 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -2,92 +2,102 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Communication" left="102" mouse_opaque="true" name="im"
      width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" 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_box" v_pad="0" width="128">
-                My Online Status:
-        </text>
-        <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+    My Online Status:
+  </text>
+  <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false"
              label="Only my Friends and Groups can see when I am online"
              left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
              width="350" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-40" 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_box2" v_pad="0" width="128">
-                IM Options:
-        </text>
-        <string name="log_in_to_change">
-                log in to change
-        </string>
-        <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
+    IM Options:
+  </text>
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
              left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
              width="350" />
-        <check_box bottom="-65" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-59" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
+    Show IMs in:
+  </text>
+  <check_box bottom="-65" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show IMs with Chat" left="148" mouse_opaque="true"
-             name="include_im_in_chat_history" radio_style="false" width="237" />
-        <check_box bottom="-85" enabled="true" follows="left|top"
+             label="Main Chat" left="248" mouse_opaque="true"
+             name="include_im_in_chat_console" radio_style="false" width="100" />
+  <check_box bottom="-65" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Local Chat" left="348" mouse_opaque="true"
+             name="include_im_in_chat_history" radio_style="false" width="100" />
+  <check_box bottom="-85" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-    <check_box bottom="-105" enabled="true"
-         follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Show online Friend notifications" left="148"
-         mouse_opaque="true" name="friends_online_notify_checkbox"
-         radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <check_box bottom="-105" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="false" label="Show online Friend notifications" left="148"
+       mouse_opaque="true" name="friends_online_notify_checkbox"
+       radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-125" 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_box3" v_pad="0" width="128">
-                Busy Mode Response:
-        </text>
-        <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
+    Busy Mode Response:
+  </text>
+  <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
              font="SansSerifSmall" height="70" left="148" max_length="255"
              mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-218" 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_box4" v_pad="0" width="128">
-                Logging Options:
-        </text>
-        <check_box bottom="-225" enabled="true"
+    Logging Options:
+  </text>
+  <check_box bottom="-225" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Save a log of IM on my computer" left="148"
              mouse_opaque="true" name="log_instant_messages" radio_style="false"
              width="237" />
-        <check_box bottom="-245" enabled="true"
+  <check_box bottom="-245" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Show timestamps in IM log" left="168"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
-        <check_box bottom="-265" enabled="true" follows="left|top"
+  <check_box bottom="-265" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show the end of last IM conversation" left="168" mouse_opaque="true"
              name="log_show_history" radio_style="false" width="217" />
-        <check_box bottom="-285" enabled="true" follows="left|top"
+  <check_box bottom="-285" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
              left="148" mouse_opaque="true" name="log_chat" radio_style="false"
              width="237" />
-        <check_box bottom="-305" enabled="true" follows="left|top"
+  <check_box bottom="-305" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-325" enabled="true" follows="left|top"
+  <check_box bottom="-325" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
-        <check_box bottom="-345" enabled="true" follows="left|top"
+  <check_box bottom="-345" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Include date with timestamps" left="148" mouse_opaque="true"
              name="log_date_timestamp" radio_style="false" width="237" />
-        <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
+  <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Change Path" label_selected="Change Path" left="170"
              mouse_opaque="true" name="log_path_button" width="90" />
-        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
+  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
              drop_shadow_visible="true" enabled="false" follows="top|left|right"
              font="SansSerifSmall" halign="right" height="19" left="248"
              max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />