4 files changed, 62 insertions, 37 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 774a13b..5c76185 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -3911,6 +3911,17 @@
         <real>1.0</real>
       </array>
     </map>
+    <key>IMInChatConsole</key>
+    <map>
+      <key>Comment</key>
+      <string>Show IMs in main chat</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IMInChatHistory</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 8e9d489..5117b8d 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -386,7 +386,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         size = INSTANT_MSG_SIZE;
                 }
                 // We display anything if it's not an IM. If it's an IM, check pref... 
-                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") )
+                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatConsole") )
                 {
                         gConsole->addLine(chat.mText, size, text_color);
                 }
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 1af6e86..39619b7 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -96,6 +96,7 @@ BOOL LLPrefsIMImpl::postBuild()
         childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
 
         // Don't enable this until we get personal data
+        childDisable("include_im_in_chat_console");
         childDisable("include_im_in_chat_history");
         childDisable("show_timestamps_check");
         childDisable("friends_online_notify_checkbox");
@@ -114,6 +115,7 @@ BOOL LLPrefsIMImpl::postBuild()
 
         childSetText("busy_response", getString("log_in_to_change"));
 
+        childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
         childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
         childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
@@ -163,6 +165,7 @@ void LLPrefsIMImpl::apply()
 
                 gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
+                gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
                 gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
                 gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
                 gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
@@ -234,6 +237,7 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
                 mOriginalHideOnlineStatus = true;
         }
 
+        childEnable("include_im_in_chat_console");
         childEnable("include_im_in_chat_history");
         childEnable("show_timestamps_check");
         childEnable("friends_online_notify_checkbox");
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" />