From fb89cb11d82395637b6dc0c9e633b76f7f6a7381 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 11 Oct 2010 12:59:25 +0200 Subject: [PATCH] Fixes for that merge, making it build. --- indra/newview/llviewercontrol.h | 4 ++++ indra/newview/llviewerobjectlist.h | 2 +- indra/newview/llvoavatar.cpp | 7 ++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 76318ed2c..45453cc07 100644 --- a/indra/newview/llviewercontrol.h +++ b/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, diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 89303b1a1..61292b343 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/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 >::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) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4931aad35..b3ce54725 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -90,6 +90,7 @@ #include "llvoicevisualizer.h" // Ventrella #include "llsdserialize.h" //For the client definitions +#include "llcachename.h" // #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(); }