From d5c377ec71fac22cf63a25daa29e1c83d9b3ef08 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 12 Jan 2010 16:33:08 -0800
Subject: Suppress rendering of last name "Resident" to display only SLIDs.
 Reviewed with Huseby

---
 indra/newview/llvoavatar.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 6e93bf1bf2..ad23aab9be 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2791,8 +2791,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					line += firstname->getString();
 				}
 
-				line += " ";
-				line += lastname->getString();
+				// Suppress last name "Resident" as this is used for new SLID names
+				if (strcmp(lastname->getString(), "Resident"))
+				{
+					line += " ";
+					line += lastname->getString();
+				}
 				BOOL need_comma = FALSE;
 
 				if (is_away || is_muted || is_busy)
-- 
cgit v1.2.3