summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-02 12:09:30 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-02 12:09:30 -0500
commit680328dd78e1d31a2f8836919a0f6140a76af5f4 (patch)
tree374628a187d74b22627aa5d2078341cda929ff7d /indra/llmessage
parent3c2db0d1792f8474b26e2adaebff6f32e4f62ff7 (diff)
parent6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff)
automated merge up from viewer-development
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcachename.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index caeaaa3be9..479efabb5f 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -975,6 +975,10 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
if (entry->mLastName.empty())
{
full_name = cleanFullName(entry->mFirstName);
+
+ //fix what we are putting in the cache
+ entry->mFirstName = full_name;
+ entry->mLastName = "Resident";
}
else
{