diff options
author | McCabe Maxsted | 2009-10-02 05:17:31 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-02 05:17:31 -0700 |
commit | 58aab90cbff6035a2e31bde404b8ceda1fc3ca66 (patch) | |
tree | 8f24dbe9ba67b4fbc48c2170b6badd42214d8fdf /linden/indra/newview/llnetmap.cpp | |
parent | Draw selected avatars last (and fixed silver skin missing selection color) (diff) | |
download | meta-impy-58aab90cbff6035a2e31bde404b8ceda1fc3ca66.zip meta-impy-58aab90cbff6035a2e31bde404b8ceda1fc3ca66.tar.gz meta-impy-58aab90cbff6035a2e31bde404b8ceda1fc3ca66.tar.bz2 meta-impy-58aab90cbff6035a2e31bde404b8ceda1fc3ca66.tar.xz |
Draw Imprudence developers as purple dots in the mini-map (name list in LLFloaterMap)
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
-rw-r--r-- | linden/indra/newview/llnetmap.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index dc4a4ae..5aaee1a 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp | |||
@@ -344,6 +344,7 @@ void LLNetMap::draw() | |||
344 | LLColor4 friend_color = gColors.getColor( "MapFriend" ); | 344 | LLColor4 friend_color = gColors.getColor( "MapFriend" ); |
345 | LLColor4 muted_color = gColors.getColor( "MapMuted" ); | 345 | LLColor4 muted_color = gColors.getColor( "MapMuted" ); |
346 | LLColor4 selected_color = gColors.getColor( "MapSelected" ); | 346 | LLColor4 selected_color = gColors.getColor( "MapSelected" ); |
347 | LLColor4 imp_dev_color = gColors.getColor( "MapImpDev" ); | ||
347 | LLColor4 glyph_color; | 348 | LLColor4 glyph_color; |
348 | int selected = -1; | 349 | int selected = -1; |
349 | 350 | ||
@@ -369,6 +370,10 @@ void LLNetMap::draw() | |||
369 | { | 370 | { |
370 | glyph_color = muted_color; | 371 | glyph_color = muted_color; |
371 | } | 372 | } |
373 | else if (LLFloaterMap::isImpDev(avatar_ids[i])) | ||
374 | { | ||
375 | glyph_color = imp_dev_color; | ||
376 | } | ||
372 | else if (is_agent_friend(avatar_ids[i])) | 377 | else if (is_agent_friend(avatar_ids[i])) |
373 | { | 378 | { |
374 | glyph_color = friend_color; | 379 | glyph_color = friend_color; |
@@ -403,7 +408,7 @@ void LLNetMap::draw() | |||
403 | } | 408 | } |
404 | 409 | ||
405 | // Draw dot for selected avatar last | 410 | // Draw dot for selected avatar last |
406 | if (selected >= 0) | 411 | if (selected >= 0 && avatar_ids[selected].notNull()) |
407 | { | 412 | { |
408 | pos_map = globalPosToView(positions[selected], rotate_map); | 413 | pos_map = globalPosToView(positions[selected], rotate_map); |
409 | F32 glyph_radius = mDotRadius * 1.7f; | 414 | F32 glyph_radius = mDotRadius * 1.7f; |