summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-16 11:58:21 -0800
committerJames Cook <james@lindenlab.com>2010-02-16 11:58:21 -0800
commit65d388d162dc14f5b8b3e0bfff1ae1125736f564 (patch)
tree2d6ac13cc54c6e4846b753248a409fd477540bce /indra/llmessage
parentb34225a1918026ed8557a19cacf5925d107c134a (diff)
Fix display of SLID-only accounts - prototype display name code was
putting duplicate name in parentheses.
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llavatarnamecache.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 610bc58057..6dac25cd63 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -145,14 +145,15 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
return true;
}
- std::string full_name;
- if (gCacheName->getFullName(agent_id, full_name))
- {
- av_name->mSLID = slid_from_full_name(full_name);
- av_name->mDisplayName = full_name;
- av_name->mBadge = "Generic_Person";
- return true;
- }
+ // JAMESDEBUG Enable when we turn on display names.
+ //std::string full_name;
+ //if (gCacheName->getFullName(agent_id, full_name))
+ //{
+ // av_name->mSLID = slid_from_full_name(full_name);
+ // av_name->mDisplayName = full_name;
+ // av_name->mBadge = "Generic_Person";
+ // return true;
+ //}
return false;
}