Second Life viewer sources 1.23.0-RC

1 files changed, 27 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index f83ce6c..682ed8e 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -70,6 +71,7 @@
 #include "llchatbar.h"
 #include "lllogchat.h"
 #include "lltexteditor.h"
+#include "lltextparser.h"
 #include "llfloaterhtml.h"
 #include "llweb.h"
 #include "llstylemap.h"
@@ -189,7 +191,7 @@ void LLFloaterChat::updateConsoleVisibility()
                                                         || (getHost() && getHost()->isMinimized() ));   // are we hosted in a minimized floater?
 }
 
-void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LLColor4& color)
+void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& color)
 {
         std::string line = chat.mText;
         bool prepend_newline = true;
@@ -199,16 +201,22 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
                 prepend_newline = false;
         }
 
-        // If the msg is not from an agent (not yourself though),
+        // If the msg is from an agent (not yourself though),
         // extract out the sender name and replace it with the hotlinked name.
         if (chat.mSourceType == CHAT_SOURCE_AGENT &&
-                chat.mFromID != LLUUID::null &&
-                (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+                chat.mFromID != LLUUID::null)
+        {
+                chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str());
+        }
+
+        // If the chat line has an associated url, link it up to the name.
+        if (!chat.mURL.empty()
+                && (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
         {
                 std::string start_line = line.substr(0, chat.mFromName.length() + 1);
                 line = line.substr(chat.mFromName.length() + 1);
-                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID);
-                edit->appendStyledText(start_line, false, prepend_newline, &sourceStyle);
+                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
+                edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
                 prepend_newline = false;
         }
         edit->appendColoredText(line, false, prepend_newline, color);
@@ -256,6 +264,9 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
         history_editor->setParseHTML(TRUE);
         history_editor_with_mute->setParseHTML(TRUE);
         
+        history_editor->setParseHighlights(TRUE);
+        history_editor_with_mute->setParseHighlights(TRUE);
+        
         if (!chat.mMuted)
         {
                 add_timestamped_line(history_editor, chat, color);
@@ -386,7 +397,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         text_color = gSavedSettings.getColor("IMChatColor");
                         size = INSTANT_MSG_SIZE;
                 }
-                gConsole->addLine(chat.mText, size, text_color);
+                // We display anything if it's not an IM. If it's an IM, check pref...
+                if      ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") ) 
+                {
+                        gConsole->addLine(chat.mText, size, text_color);
+                }
         }
 
         if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
@@ -394,7 +409,10 @@ void LLFloaterChat::addChat(const LLChat& chat,
         
         if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))
                 addChatHistory(chat,false);
-        
+
+        LLTextParser* highlight = LLTextParser::getInstance();
+        highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());
+
         if(!from_instant_message)
                 addChatHistory(chat);
 }