summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2010-11-12 17:28:44 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2010-11-12 17:28:44 +0200
commitef46e7037ca59224dfcdf3745e165ee97b086a69 (patch)
tree77d53db8cb46741d971a750e7b91895e51659321 /indra
parent5f099265fc36c885122457edd87a1ec8c1a80873 (diff)
STORM-579 FIXED resident SLURL font color to match Chat preferences for plain text Nearby Chat log
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llchathistory.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 0f7e9313a9..271ee0c4a4 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -798,9 +798,14 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
else if ( chat.mFromName != SYSTEM_FROM && chat.mFromID.notNull() && !message_from_log)
{
LLStyle::Params link_params(style_params);
- link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
+
+ // Setting is_link = true for agent SLURL to avoid applying default style to it.
+ // See LLTextBase::appendTextImpl().
+ link_params.is_link = true;
+ link_params.link_href = LLSLURL("agent", chat.mFromID, "inspect").getSLURLString();
+
// Add link to avatar's inspector and delimiter to message.
- mEditor->appendText(link_params.link_href, false, style_params);
+ mEditor->appendText(chat.mFromName, false, link_params);
mEditor->appendText(delimiter, false, style_params);
}
else