From 51dc0550d5af3e84262b208d74e8389890924a2a Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 27 Apr 2014 11:18:31 -0400 Subject: [PATCH] Minimap mark colors touchup Now shown in tag without tag color statuses needing to show. --- indra/newview/llvoavatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 3d14f488c..64222ff51 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -913,13 +913,13 @@ const LLUUID SHClientTagMgr::getClientID(const LLVOAvatar* pAvatar) const bool mm_getMarkerColor(const LLUUID&, LLColor4&); bool SHClientTagMgr::getClientColor(const LLVOAvatar* pAvatar, bool check_status, LLColor4& color) const { + if (mm_getMarkerColor(pAvatar->getID(), color)) return true; static const LLCachedControl ascent_use_status_colors("AscentUseStatusColors",true); static const LLCachedControl ascent_show_self_tag_color("AscentShowSelfTagColor"); static const LLCachedControl ascent_show_others_tag_color("AscentShowOthersTagColor"); 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()); if(LLMuteList::getInstance()->isLinden(pAvatar->getFullname())) {