Fixes for that merge, making it build.

indra/newview/llviewercontrol.h

@@ -149,6 +149,10 @@ public:
 
 	operator const T&() { return mCachedValue; }
 
+	const LLControlVariable * getControl() {
+		return mControl;
+	}
+
 private:
 	void declareTypedControl(LLControlGroup& group, 
 							 const std::string& name, 

indra/newview/llviewerobjectlist.h

@@ -263,7 +263,7 @@ inline LLViewerObject *LLViewerObjectList::findObject(const LLUUID &id) const
 inline LLVOAvatar *LLViewerObjectList::findAvatar(const LLUUID &id) const
 {
 	std::map<LLUUID, LLPointer<LLVOAvatar> >::const_iterator iter = mUUIDAvatarMap.find(id);
-	return (iter != mUUIDAvatarMap.end()) ? iter->second : NULL;
+	return (iter != mUUIDAvatarMap.end()) ? iter->second.get() : NULL;
 }
 
 inline LLViewerObject *LLViewerObjectList::getObject(const S32 index)

indra/newview/llvoavatar.cpp

@@ -90,6 +90,7 @@
 #include "llvoicevisualizer.h" // Ventrella
 
 #include "llsdserialize.h" //For the client definitions
+#include "llcachename.h"
 
 // <edit>
 #include "llfloaterexploreanimations.h"
@@ -3748,12 +3749,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 						estate_owner = parent_estate->getOwner();
 					}
 					
-					std::string name;
-					name += firstname->getString();
-					name += " ";
-					name += lastname->getString();
 					//Lindens are always more Linden than your friend, make that take precedence
-					if(LLMuteList::getInstance()->isLinden(name))
+					if(LLMuteList::getInstance()->isLinden(getFullname()))
 					{
 						mClientColor = gCOASavedSettings->getColor4("AscentLindenColor").getValue();
 					}