From b96be7f613dfe0a41649990a87baa13d29bd5efc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 3 Jun 2010 01:32:45 -0700 Subject: Fixed your own name being highlighted in chat history --- linden/indra/newview/llfloaterchat.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index 3681a6f..994776e 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp @@ -208,6 +208,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& // extract out the sender name and replace it with the hotlinked name. if (chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID != LLUUID::null && + chat.mFromID != gAgent.getID() && // [RLVa] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) // [/RLVa] @@ -218,10 +219,10 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& // 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 || (line.find(chat.mFromName,0) == 4 && - color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight + color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight -- MC { std::string start_line; - if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " + if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " -- MC { start_line = line.substr(4, chat.mFromName.length() + 1); std::string source = line.substr(0, 4); -- cgit v1.1