Added new color setting for Object IMs

6 files changed, 51 insertions, 17 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3a0e0d1..9d9f487 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,14 @@
 2009-10-02 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Added new color setting for Object IMs.
+        
+      modified:   linden/indra/llcommon/llchat.h
+      modified:   linden/indra/newview/app_settings/settings.xml
+      modified:   linden/indra/newview/llfloaterchat.cpp
+      modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+
+
         * Fixed 1.2 beta features missing from silver skin.
         
           deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 6c75a25..4ec9a08 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -42,7 +42,8 @@ typedef enum e_chat_source_type
 {
         CHAT_SOURCE_SYSTEM = 0,
         CHAT_SOURCE_AGENT = 1,
-        CHAT_SOURCE_OBJECT = 2
+        CHAT_SOURCE_OBJECT = 2,
+        CHAT_SOURCE_OBJECT_IM = 3
 } EChatSourceType;
 
 typedef enum e_chat_type
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7cc10af..84baa99 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5449,6 +5449,22 @@
          <real>1</real>
       </array>
     </map>
+    <key>ObjectIMColor</key>
+    <map>
+      <key>Comment</key>
+      <string>Color of IMs from objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.699999988079</real>
+        <real>0.899999976158</real>
+        <real>0.699999988079</real>
+        <real>1</real>
+      </array>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a4082fd..cc86fce 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -548,6 +548,9 @@ LLColor4 get_text_color(const LLChat& chat)
                                 text_color = gSavedSettings.getColor4("ObjectChatColor");
                         }
                         break;
+                case CHAT_SOURCE_OBJECT_IM:
+                        text_color = gSavedSettings.getColor4("ObjectIMColor");
+                        break;
                 default:
                         text_color.setToWhite();
                 }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index e01aa4f..9b7ec48 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1966,7 +1966,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
                         // Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
                         // IMs from objcts don't open IM sessions.
-                        chat.mSourceType = CHAT_SOURCE_OBJECT;
+                        chat.mSourceType = CHAT_SOURCE_OBJECT_IM;
                         LLFloaterChat::addChat(chat, FALSE, FALSE);
                 }
                 break;
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 b0384cf..6233cbe 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
@@ -33,44 +33,49 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
              enabled="true" follows="left|top" height="56" label="You" left="148"
-             mouse_opaque="true" name="user" width="44" />
+             mouse_opaque="true" name="user" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
-             mouse_opaque="true" name="agent" width="44" />
+             enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
+             mouse_opaque="true" name="agent" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
-             mouse_opaque="true" name="im" width="44" />
+             enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
+             mouse_opaque="true" name="im" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.8 1 1 1"
              enabled="true" follows="left|top"
-             height="56" label="System" left_delta="48" mouse_opaque="true"
-             name="system" width="44" />
+             height="56" label="System" left_delta="68" mouse_opaque="true"
+             name="system" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.82 0.82 0.99 1"
              control_name="ScriptErrorColor" enabled="true" follows="left|top"
-             height="56" label="Errors" left_delta="48" mouse_opaque="true"
-             name="script_error" width="44" />
+             height="56" label="Errors" left_delta="68" mouse_opaque="true"
+             name="script_error" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
              height="56" label="Objects" left="148" mouse_opaque="true"
-             name="objects" width="44" />
+             name="objects" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+             height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
+       name="object_ims" width="54" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
              enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
-             width="44" />
+             height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
+             width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0 0 0 1"
              enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="48" mouse_opaque="true"
-             name="background" width="44" />
+             height="56" label="Bubble" left_delta="68" mouse_opaque="true"
+             name="background" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
+             label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"