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

Minimap mark colors touchup

Browse Source 
Now shown in tag without tag color statuses needing to show.
This commit is contained in:
Lirusaito
2014-04-27 11:18:31 -04:00
parent ac9e36549b
commit 51dc0550d5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvoavatar.cpp
View File

@@ -913,13 +913,13 @@ const LLUUID SHClientTagMgr::getClientID(const LLVOAvatar* pAvatar) const
bool mm_getMarkerColor(const LLUUID&, LLColor4&); bool mm_getMarkerColor(const LLUUID&, LLColor4&);
bool SHClientTagMgr::getClientColor(const LLVOAvatar* pAvatar, bool check_status, LLColor4& color) const bool SHClientTagMgr::getClientColor(const LLVOAvatar* pAvatar, bool check_status, LLColor4& color) const
{ {
if (mm_getMarkerColor(pAvatar->getID(), color)) return true;
static const LLCachedControl<bool> ascent_use_status_colors("AscentUseStatusColors",true); static const LLCachedControl<bool> ascent_use_status_colors("AscentUseStatusColors",true);
static const LLCachedControl<bool> ascent_show_self_tag_color("AscentShowSelfTagColor"); static const LLCachedControl<bool> ascent_show_self_tag_color("AscentShowSelfTagColor");
static const LLCachedControl<bool> ascent_show_others_tag_color("AscentShowOthersTagColor"); static const LLCachedControl<bool> ascent_show_others_tag_color("AscentShowOthersTagColor");
if(check_status && ascent_use_status_colors && !pAvatar->isSelf()) if(check_status && ascent_use_status_colors && !pAvatar->isSelf())
{ {
if (mm_getMarkerColor(pAvatar->getID(), color)) return true;
LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(pAvatar->getPositionGlobal()); LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(pAvatar->getPositionGlobal());
if(LLMuteList::getInstance()->isLinden(pAvatar->getFullname())) if(LLMuteList::getInstance()->isLinden(pAvatar->getFullname()))
{ {