diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-13 16:29:33 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-13 16:29:33 +0300 |
| commit | e2d32b9e9d48d0efde92c54c9aaa62fa56671002 (patch) | |
| tree | c1a26bc57db3b6f27aaa4b02bc4bcac66392e271 | |
| parent | 22c849def9078d8a4376cbf59164403ca55368cf (diff) | |
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
| -rw-r--r-- | indra/llmessage/llcachename.cpp | 4 |
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); |