Shiny new name cache.

indra/llcommon/llavatarname.cpp

@@ -25,10 +25,6 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
-
-/*
-Ported to Phoenix by Wolfspirit Magic.
-*/
 #include "linden_common.h"
 
 #include "llavatarname.h"
@@ -52,7 +48,7 @@ LLAvatarName::LLAvatarName()
 	mLegacyFirstName(),
 	mLegacyLastName(),
 	mIsDisplayNameDefault(false),
-	mIsDummy(false),
+	mIsTemporaryName(false),
 	mExpires(F64_MAX),
 	mNextUpdate(0.0)
 { }
@@ -94,21 +90,16 @@ void LLAvatarName::fromLLSD(const LLSD& sd)
 std::string LLAvatarName::getCompleteName(bool linefeed) const
 {
 	std::string name;
-	if (!mUsername.empty())
+	if (mUsername.empty() || mIsDisplayNameDefault)
+	// If the display name feature is off
+	// OR this particular display name is defaulted (i.e. based on user name),
+	// then display only the easier to read instance of the person's name.
 	{
-		if (linefeed)
-		{
-			name = mDisplayName + "\n(" + mUsername + ")";
-		}
-		else
-		{
-			name = mDisplayName + " (" + mUsername + ")";
-		}
+		name = mDisplayName;
 	}
 	else
 	{
-		// ...display names are off, legacy name is in mDisplayName
-		name = mDisplayName;
+		name = mDisplayName + (linefeed ? "\n(" : "(") + mUsername + ")";
 	}
 	return name;
 }