Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Resident no longer stripping for username only mode

Browse Source 
Thanks for noticing this Gamer Expert
This commit is contained in:
Inusaito Sayori
2014-12-19 21:27:07 -05:00
parent 8e5fad2209
commit 94d6969fed
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llmessage/llavatarname.cpp
View File

@@ -29,6 +29,7 @@
#include "llavatarname.h"
#include "llcontrol.h" // For LLCachedControl
#include "lldate.h"
#include "llframetimer.h"
#include "llsd.h"
@@ -200,12 +201,10 @@ std::string LLAvatarName::getLegacyName() const
return mDisplayName;
}
std::string name;
name.reserve( mLegacyFirstName.size() + 1 + mLegacyLastName.size() );
name = mLegacyFirstName;
name += " ";
name += mLegacyLastName;
return name;
static const LLCachedControl<bool> show_resident("LiruShowLastNameResident", false);
if (show_resident || mLegacyLastName != "Resident")
return mLegacyFirstName + ' ' + mLegacyLastName;
return mLegacyFirstName;
}
std::string LLAvatarName::getDisplayName() const