From 10fc6ee4a012fa7232868261d6e11a76652c3cca Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Sat, 13 Mar 2010 22:00:40 -0800
Subject: [PATCH] Hack to use display names for text chat
---
indra/newview/llviewermessage.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6a8832b64df..a1ff0f37479 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2627,7 +2627,18 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// IDEVO Correct for new-style "Resident" names
if (chat.mSourceType == CHAT_SOURCE_AGENT)
{
- chat.mFromName = LLCacheName::cleanFullName(from_name);
+ // JAMESDEBUG - I don't know if it's OK to change this here, if
+ // anything downstream does lookups by name, for instance
+ LLAvatarName av_name;
+ if (LLAvatarNameCache::useDisplayNames()
+ && LLAvatarNameCache::get(from_id, &av_name))
+ {
+ chat.mFromName = av_name.mDisplayName;
+ }
+ else
+ {
+ chat.mFromName = LLCacheName::cleanFullName(from_name);
+ }
}
else
{
--
GitLab