diff --git a/indra/newview/fsdata.h b/indra/newview/fsdata.h
index e3683cac5e..c3f4b11b2b 100644
--- a/indra/newview/fsdata.h
+++ b/indra/newview/fsdata.h
@@ -81,7 +81,7 @@ public:
 	static void callbackReqInfo(const LLSD &notification, const LLSD &response);
 	static void sendInfo(LLUUID destination, LLUUID sessionid, std::string myName, EInstantMessage dialog);
 	
-	LLSD FSData::LegacyClientList;
+	LLSD LegacyClientList;
 	
 	std::map<std::string, LLSD> blocked_versions;
 	static LLSD blocked_login_info;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 8603f5179c..d8075654e6 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3305,7 +3305,7 @@ LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
 
 	//Wolfspirit: If we don't display a friend, then use "NameTagV1"
 
-	if(use_old_color && color_name!="NameTagFriend"){
+	if(use_old_color && !(show_friends && is_friend)){
 		return LLUIColorTable::getInstance()->getColor("NameTagV1");
 	}