summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
commit168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch)
tree47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/llmessage
parentf480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff)
parent8dd62863092b10e012db20e818e72b53fd2ed84a (diff)
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcachename.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 9363b3a8d5..9871c922f1 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -486,7 +486,7 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
{
first = sCacheName["nobody"];
last.clear();
- return FALSE;
+ return TRUE;
}
LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
@@ -530,7 +530,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
if(id.isNull())
{
group = sCacheName["none"];
- return FALSE;
+ return TRUE;
}
LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id);