Fix Resident no longer stripping for username only mode

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

View File

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