livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13095: Override nametag color with mark color set on minimap

Ansariel 2014-03-13 10:24:20 +01:00
parent e19c6b0f5f
commit b0b909d91f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llnetmap.h
View File

@ -101,6 +101,7 @@ public:
void performDoubleClickAction(LLVector3d pos_global);
// <FS:Ansariel> Mark avatar feature
static bool hasAvatarMarkColor(const LLUUID& avatar_id) { return sAvatarMarksMap.find(avatar_id) != sAvatarMarksMap.end(); }
static bool getAvatarMarkColor(const LLUUID& avatar_id, LLColor4& color);
static void setAvatarMarkColor(const LLUUID& avatar_id, const LLSD& color);
static void setAvatarMarkColors(const uuid_vec_t& avatar_ids, const LLSD& color);

16
indra/newview/llvoavatar.cpp
View File

@ -108,10 +108,11 @@
#include "llsdserialize.h"
#include "fsdata.h"
#include "llcontrol.h"
#include "lggcontactsets.h"
#include "llfilepicker.h" // <FS:CR> FIRE-8893 - Dump archetype xml to user defined location
#include "lfsimfeaturehandler.h" // <FS:CR> Opensim
#include "lggcontactsets.h"
#include "llcontrol.h"
#include "llfilepicker.h" // <FS:CR> FIRE-8893 - Dump archetype xml to user defined location
#include "llnetmap.h"
#include "llviewernetwork.h" // [FS:CR] isInSecondlife()
extern F32 SPEED_ADJUST_MAX;
@ -2891,8 +2892,10 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// then use that color as name_tag_color
static LLUICachedControl<bool> show_friends("NameTagShowFriends");
static LLUICachedControl<U32> color_client_tags("FSColorClienttags");
bool special_color_override = (show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_TAG))) ||
LLNetMap::hasAvatarMarkColor(getID());
if (mClientTagData.has("color")
&& !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_TAG)))
&& !special_color_override
&& color_client_tags && !this->isSelf())
{
name_tag_color = mClientTagData["color"];
@ -2937,8 +2940,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// Override nametag color only if friend color is disabled
// or avatar is not a friend nor has a contact set color
if (show_distance_color_tag
&& !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_TAG))))
if (show_distance_color_tag && !special_color_override)
{
name_tag_color = distance_color;
}
@ -3394,6 +3396,8 @@ LLColor4 LLVOAvatar::getNameTagColor()
color = LGGContactSets::getInstance()->getFriendColor(getID());
}
LLNetMap::getAvatarMarkColor(getID(), color);
return color;
}