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

Feature Request: When someone is marked on the minimap have that color persist on the radar and their tags

Browse Source 
Jus' look at dat color~
This commit is contained in:
Inusaito Sayori
2014-04-23 02:50:51 -04:00
parent 6526c28e47
commit 3db489f4df
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloateravatarlist.cpp
View File

@@ -646,6 +646,8 @@ void LLFloaterAvatarList::updateAvatarSorting()
} }
} }
bool mm_getMarkerColor(const LLUUID&, LLColor4&);
/** /**
* Redraws the avatar list * Redraws the avatar list
* Only does anything if the avatar list is visible. * Only does anything if the avatar list is visible.
@@ -738,7 +740,8 @@ void LLFloaterAvatarList::refreshAvatarList()
LLColor4 color = sDefaultListText; LLColor4 color = sDefaultListText;
//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(av_id)) if (mm_getMarkerColor(av_id, color)) {}
else if (LLMuteList::getInstance()->isLinden(av_id))
{ {
static const LLCachedControl<LLColor4> ascent_linden_color("AscentLindenColor", LLColor4(0.f,0.f,1.f,1.f)); static const LLCachedControl<LLColor4> ascent_linden_color("AscentLindenColor", LLColor4(0.f,0.f,1.f,1.f));
color = ascent_linden_color; color = ascent_linden_color;

13
indra/newview/llnetmap.cpp
View File

@@ -215,6 +215,13 @@ std::size_t hash_value(const LLUUID& uuid)
return (std::size_t)uuid.getCRC32(); return (std::size_t)uuid.getCRC32();
} }
boost::unordered_map<const LLUUID,LLColor4> mm_MarkerColors; boost::unordered_map<const LLUUID,LLColor4> mm_MarkerColors;
bool mm_getMarkerColor(const LLUUID& id, LLColor4& color)
{
boost::unordered_map<const LLUUID,LLColor4>::const_iterator it = mm_MarkerColors.find(id);
if (it == mm_MarkerColors.end()) return false;
color = it->second;
return true;
}
void LLNetMap::mm_setcolor(LLUUID key,LLColor4 col) void LLNetMap::mm_setcolor(LLUUID key,LLColor4 col)
{ {
@@ -574,11 +581,7 @@ void LLNetMap::draw()
LLUUID estate_owner = avatar_region ? avatar_region->getOwner() : LLUUID::null; LLUUID estate_owner = avatar_region ? avatar_region->getOwner() : LLUUID::null;
// MOYMOD Minimap custom av colors. // MOYMOD Minimap custom av colors.
boost::unordered_map<const LLUUID,LLColor4>::const_iterator it = mm_MarkerColors.find(uuid); if (mm_getMarkerColor(uuid, color)) {}
if(it != mm_MarkerColors.end())
{
color = it->second;
}
//Lindens are always more Linden than your friend, make that take precedence //Lindens are always more Linden than your friend, make that take precedence
else if (LLMuteList::getInstance()->isLinden(uuid)) else if (LLMuteList::getInstance()->isLinden(uuid))
{ {

2
indra/newview/llvoavatar.cpp
View File

@@ -910,6 +910,7 @@ const LLUUID SHClientTagMgr::getClientID(const LLVOAvatar* pAvatar) const
} }
return tag.asUUID(); return tag.asUUID();
} }
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
{ {
static const LLCachedControl<bool> ascent_use_status_colors("AscentUseStatusColors",true); static const LLCachedControl<bool> ascent_use_status_colors("AscentUseStatusColors",true);
@@ -918,6 +919,7 @@ bool SHClientTagMgr::getClientColor(const LLVOAvatar* pAvatar, bool check_status
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()))
{ {