summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:02:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:02:21 +0100
commitc890ca021a49e52095e9a8de7db528e48c3da205 (patch)
tree1e5227e803980b3df83a77e0d0c39623e0fa2069 /indra/newview/llchathistory.cpp
parent60b12a24d4a6061a3fe22a433cb8852002a8e857 (diff)
parent20bdbd487e9c64ce553ad68d467b1100342fe6a1 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 7c33923f04..7204e6c39c 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -699,8 +699,9 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
{
LLStyle::Params link_params(style_params);
link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
- // Convert the name to a hotlink and add to message.
- mEditor->appendText(chat.mFromName + delimiter, false, link_params);
+ // Add link to avatar's inspector and delimiter to message.
+ mEditor->appendText(link_params.link_href, false, style_params);
+ mEditor->appendText(delimiter, false, style_params);
}
else
{