Added nicknames support for chat highlighting (up to 3) in prefs->adv->extra

1 files changed, 23 insertions, 5 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index f352926..59f4d70 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -453,14 +453,32 @@ void LLFloaterChat::updateSettings()
         LLFloaterChat::getInstance(LLSD())->getChild<LLCheckBoxCtrl>("translate chat")->set(translate_chat);
 }
 
-BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
+BOOL checkStringInText(const std::string &text_line, std::string textToMatch)
 {
-        std::string my_name = gSavedSettings.getString("FirstName");
-        std::string pattern_s = "(^|.*[_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+)(" + my_name + ")([_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+.*|$)";
         boost::smatch what;
-        boost::regex e1(pattern_s, boost::regex::icase);
+        std::string pattern_s = "(^|.*[_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+)(" + textToMatch + ")([_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+.*|$)";
+        boost::regex expression(pattern_s, boost::regex::icase);
+        return boost::regex_search(text_line, what, expression);
+}
+
+BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
+{
+        if (checkStringInText(text_line, gSavedSettings.getString("FirstName")))
+                return TRUE;
+
+        for (int i=1; i<=3; i++)
+        {
+                std::stringstream key;
+                key << "nick0" << i;
+                std::string nick = gSavedSettings.getString(key.str());
+                if (! nick.empty())
+                {
+                        if (checkStringInText(text_line, nick))
+                                return TRUE;
+                }
+        }
 
-        return boost::regex_search(text_line, what, e1);
+        return FALSE;
 }
 
 LLColor4 get_extended_text_color(const LLChat& chat, LLColor4 defaultColor)