Merge branch 'master' of git://github.com/siana/SingularityViewer.git

This commit is contained in:
Shyotl
2011-02-12 18:21:20 -06:00
6 changed files with 23 additions and 15 deletions

View File

@@ -521,7 +521,8 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
{
std::string first_name, last_name;
BOOL res = getName(id, first_name, last_name);
fullname = first_name + " " + last_name;
if(res)
fullname = first_name + " " + last_name;
return res;
}