summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
commit375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch)
treec4bbed389b33de9dc8fbc746bccccb6545307ad6 /indra/llmessage
parent732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff)
parent20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff)
merge fix for STORM-679
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
{