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

Updates to the tag system to allow "status" tags to be on even if the client tags are off. Essentially split the Linden/Friend/EM/Muted system from the client tag options.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-28 17:46:00 -04:00
parent d36f86f674
commit 6ab2f45f99
1 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/llvoavatar.cpp
View File

@@ -3511,6 +3511,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
new_name = TRUE; new_name = TRUE;
} }
LLNameValue *title = getNVPair("Title");
LLNameValue* firstname = getNVPair("FirstName");
LLNameValue* lastname = getNVPair("LastName");
// <edit> // <edit>
std::string client; std::string client;
// </edit> // </edit>
@@ -3593,15 +3597,50 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
if (gSavedSettings.getBOOL("AscentShowFriendsTag")) if (gSavedSettings.getBOOL("AscentShowFriendsTag"))
{ {
mClientTag = "Friend"; mClientTag = "Friend";
mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
} }
} }
} }
if (!mIsSelf && gSavedSettings.getBOOL("AscentUseStatusColors"))
{
LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(this->getPositionGlobal());
LLUUID estate_owner = LLUUID::null;
if(parent_estate && parent_estate->isAlive())
{
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))
{
mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentLindenColor").getValue();
}
//check if they are an estate owner at their current position
else if(estate_owner.notNull() && this->getID() == estate_owner)
{
mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentEstateOwnerColor").getValue();
}
//without these dots, SL would suck.
else if (LLAvatarTracker::instance().getBuddyInfo(this->getID()) != NULL)
{
mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
}
//big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(this->getID()))
{
mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentMutedColor").getValue();
}
}
client = mClientTag; client = mClientTag;
if ((mIsSelf && gSavedSettings.getBOOL("AscentShowSelfTagColor")) if ((mIsSelf && gSavedSettings.getBOOL("AscentShowSelfTagColor"))
|| (!mIsSelf && gSavedSettings.getBOOL("AscentShowOthersTagColor"))) || (!mIsSelf && gSavedSettings.getBOOL("AscentShowOthersTagColor")))
avatar_name_color = mClientColor; avatar_name_color = mClientColor;
avatar_name_color.setAlpha(alpha); avatar_name_color.setAlpha(alpha);
@@ -3639,9 +3678,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
} }
} }
LLNameValue *title = getNVPair("Title");
LLNameValue* firstname = getNVPair("FirstName");
LLNameValue* lastname = getNVPair("LastName");
if (mNameText.notNull() && firstname && lastname) if (mNameText.notNull() && firstname && lastname)
{ {