Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for that merge, making it build.

Browse Source
This commit is contained in:
Siana Gearz
2010-10-11 12:59:25 +02:00
parent 6c8080d1a6
commit fb89cb11d8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewercontrol.h
View File

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

2
indra/newview/llviewerobjectlist.h
View File

@@ -263,7 +263,7 @@ inline LLViewerObject *LLViewerObjectList::findObject(const LLUUID &id) const
inline LLVOAvatar *LLViewerObjectList::findAvatar(const LLUUID &id) const inline LLVOAvatar *LLViewerObjectList::findAvatar(const LLUUID &id) const
{ {
std::map<LLUUID, LLPointer<LLVOAvatar> >::const_iterator iter = mUUIDAvatarMap.find(id); 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) inline LLViewerObject *LLViewerObjectList::getObject(const S32 index)

7
indra/newview/llvoavatar.cpp
View File

@@ -90,6 +90,7 @@
#include "llvoicevisualizer.h" // Ventrella #include "llvoicevisualizer.h" // Ventrella
#include "llsdserialize.h" //For the client definitions #include "llsdserialize.h" //For the client definitions
#include "llcachename.h"
// <edit> // <edit>
#include "llfloaterexploreanimations.h" #include "llfloaterexploreanimations.h"
@@ -3748,12 +3749,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
estate_owner = parent_estate->getOwner(); 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 //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(); mClientColor = gCOASavedSettings->getColor4("AscentLindenColor").getValue();
} }