aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-15 23:44:25 -0700
committerMcCabe Maxsted2009-09-15 23:44:25 -0700
commitb86a81bb6a425234238770c7ff997e92b94777f1 (patch)
tree66c192d887c4a6e521bf4dd617a3e28603e912e3 /linden/indra/newview/llnetmap.cpp
parentAdded tabs to mini-map radar (diff)
downloadmeta-impy-b86a81bb6a425234238770c7ff997e92b94777f1.zip
meta-impy-b86a81bb6a425234238770c7ff997e92b94777f1.tar.gz
meta-impy-b86a81bb6a425234238770c7ff997e92b94777f1.tar.bz2
meta-impy-b86a81bb6a425234238770c7ff997e92b94777f1.tar.xz
Some code cleanup
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llnetmap.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index c66e816..1f6f6bd 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -347,9 +347,13 @@ void LLNetMap::draw()
347 // TODO: it'd be very cool to draw these in sorted order from lowest Z to highest. 347 // TODO: it'd be very cool to draw these in sorted order from lowest Z to highest.
348 // just be careful to sort the avatar IDs along with the positions. -MG 348 // just be careful to sort the avatar IDs along with the positions. -MG
349 pos_map = globalPosToView(positions[i], rotate_map); 349 pos_map = globalPosToView(positions[i], rotate_map);
350 350
351 if (LLFloaterMap::getSelected() == avatar_ids[i])
352 {
353 glyph_color = selected_color;
354 }
351 // Show them muted even if they're friends 355 // Show them muted even if they're friends
352 if (LLMuteList::getInstance()->isMuted(avatar_ids[i])) 356 else if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
353 { 357 {
354 glyph_color = muted_color; 358 glyph_color = muted_color;
355 } 359 }
@@ -357,10 +361,6 @@ void LLNetMap::draw()
357 { 361 {
358 glyph_color = friend_color; 362 glyph_color = friend_color;
359 } 363 }
360 else if (LLFloaterMap::isSelected(avatar_ids[i]))
361 {
362 glyph_color = selected_color;
363 }
364 else 364 else
365 { 365 {
366 glyph_color = avatar_color; 366 glyph_color = avatar_color;