4 files changed, 112 insertions, 20 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index db44efd..6d07ece 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,60 @@
   
   <!-- Imprudence-specific settings -->
 
+  <key>HighlightFriendsChat</key>
+  <map>
+    <key>Comment</key>
+    <string>Show chat messages from friends in a different color</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>FriendsChatColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Color of chat messages from friends</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>HighlightOwnNameInChat</key>
+  <map>
+    <key>Comment</key>
+    <string>Show chat messages containing your name in a different color</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>OwnNameChatColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Color of chat messages from friends</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Color4</string>
+    <key>Value</key>
+    <array>
+      <real>0.8</real>
+      <real>1.0</real>
+      <real>0.8</real>
+      <real>1</real>
+    </array>
+  </map>
   <key>AllowMUpose</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index c89bc86..a38684a 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -565,30 +565,34 @@ LLColor4 get_text_color(const LLChat& chat)
                                         }
                                         else
                                         {
-                                                std::string my_name = gSavedSettings.getString("FirstName");
-                                                std::transform(my_name.begin(), my_name.end(), my_name.begin(), tolower);
-
-                                                std::string lower_chat = std::string(chat.mText);
-                                                std::transform(lower_chat.begin(), lower_chat.end(), lower_chat.begin(), tolower);
-
-                                                std::string blank = " ";
-
-                                                // yes yes, this sucks, will move to a nicer regexp as soon as i have time to make it lol
-                                                if (lower_chat.find(my_name + blank) == 0 || // at the beginning of the text
-                                                        (lower_chat.find(my_name) == 0 && lower_chat.length() == my_name.length()) || // only my name in the text
-                                                        lower_chat.find(blank + my_name + blank) != std::string::npos || // my name in the middle of the text
-                                                        lower_chat.rfind(blank + my_name) == lower_chat.length() - (blank + my_name).length()) // my name at the end of the text
+                                                if (gSavedSettings.getBOOL("HighlightOwnNameInChat"))
                                                 {
-                                                        text_color = LLColor4::purple;
+                                                        std::string my_name = gSavedSettings.getString("FirstName");
+                                                        std::transform(my_name.begin(), my_name.end(), my_name.begin(), tolower);
+
+                                                        std::string lower_chat = std::string(chat.mText);
+                                                        std::transform(lower_chat.begin(), lower_chat.end(), lower_chat.begin(), tolower);
+
+                                                        std::string blank = " ";
+
+                                                        // yes yes, this sucks, will move to a nicer regexp as soon as i have time to make it lol
+                                                        if (lower_chat.find(my_name + blank) == 0 || // at the beginning of the text
+                                                                (lower_chat.find(my_name) == 0 && lower_chat.length() == my_name.length()) || // only my name in the text
+                                                                lower_chat.find(blank + my_name + blank) != std::string::npos || // my name in the middle of the text
+                                                                lower_chat.rfind(blank + my_name) == lower_chat.length() - (blank + my_name).length()) // my name at the end of the text
+                                                        {
+                                                                text_color = gSavedSettings.getColor4("OwnNameChatColor");
+                                                                break;
+                                                        }
                                                 }
-                                                else if (is_agent_friend(chat.mFromID))
-                                                {
-                                                        text_color = LLColor4::yellow;
-                                                }
-                                                else
+
+                                                if (gSavedSettings.getBOOL("HighlightFriendsChat") && is_agent_friend(chat.mFromID))
                                                 {
-                                                        text_color = gSavedSettings.getColor4("AgentChatColor");
+                                                        text_color = gSavedSettings.getColor4("FriendsChatColor");
+                                                        break;
                                                 }
+
+                                                text_color = gSavedSettings.getColor4("AgentChatColor");
                                         }
                                 }
                         }
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index de39e01..695e604 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -41,6 +41,7 @@
 #include "lgghunspell_wrapper.h"
 #include "lggautocorrectfloater.h"
 #include "llcombobox.h"
+#include "llcolorswatch.h"
 
 #include "lluictrlfactory.h"
 
@@ -111,6 +112,11 @@ BOOL LLPrefsAdvanced::postBuild()
 
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
+        childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
+        getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
+        childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
+        getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
+
         refresh();
 
         return TRUE;
@@ -133,6 +139,10 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("LightShareAllowed",
                               (U32)childGetValue("lightshare_combo").asInteger());
 
+        gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
+        gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
+        gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
+        gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
 
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 857d1f1..65d118d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -172,5 +172,29 @@
       <button name="ac_button" label="AutoCorrect Options…" halign="center" tool_tip="Modify the AutoCorrect word list and settings" left="5"
         bottom_delta="-64" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
     </panel>
+    
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Extra" 
+    left="1" mouse_opaque="true" name="Extra" width="418">
+
+        <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+            initial_value="true" label="Show chat messages from friends in a different color" left="12"
+            mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
+
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-90"
+            can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+            enabled="true" follows="left|top" height="56" label="Friends" left_delta="68"
+            mouse_opaque="true" name="FriendsChatColor" width="54" />
+
+        <check_box bottom_delta="-30" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="true"
+                 label="Show chat messages containing your name in a different color" left="12" mouse_opaque="true"
+                 name="HighlightOwnNameInChat" radio_style="false" width="217" />
+
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-180"
+            can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+            enabled="true" follows="left|top" height="56" label="Own Name" left_delta="68"
+            mouse_opaque="true" name="OwnNameChatColor" width="54" />
+
+    </panel>
   </tab_container>
 </panel>