Skip to content
Snippets Groups Projects
Commit e2d32b9e authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

Fixed bug EXT-5415 (Edit floater and object profile show group as "loading..." when set to "none").

Made LLCacheName getGroupName() and getName() methods return TRUE if the given group/avatar name is NULL, so that LLNameBox doesn't display "Loading..." indefinitely.
There's nothing to wait for in case of NULL id: the name cache returns a predefined name that won't change (i.e. it's the final result).

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/223/

--HG--
branch : product-engine
parent 22c849de
No related branches found
No related tags found
No related merge requests found
...@@ -486,7 +486,7 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las ...@@ -486,7 +486,7 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
{ {
first = sCacheName["nobody"]; first = sCacheName["nobody"];
last.clear(); last.clear();
return FALSE; return TRUE;
} }
LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id ); LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
...@@ -530,7 +530,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group) ...@@ -530,7 +530,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
if(id.isNull()) if(id.isNull())
{ {
group = sCacheName["none"]; group = sCacheName["none"];
return FALSE; return TRUE;
} }
LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id); LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment