From 99d1eb7261e6fa21c9b30a3c0fb256029481db42 Mon Sep 17 00:00:00 2001
From: Melinda Green <melinda@lindenlab.com>
Date: Fri, 21 Sep 2007 00:09:08 +0000
Subject: James discovered a bug in the minifriends code that can be triggered
when running a new viewer build with VS2005 talking to an old simulator. This
change works around that problem and was reviewed by James.
---
indra/newview/llnetmap.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index ffb3bad2aa..cba07c5678 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -405,10 +405,11 @@ void LLNetMap::draw()
pos_map = globalPosToView(pos_global);
- LLUUID avatar_id = regionp->mMapAvatarIDs.get(i);
- BOOL show_as_friend =
- //is_agent_mappable(avatar_id); // if we're only highlighting mappable friends
- is_agent_friend(avatar_id); // if we're always highlighting friends
+ BOOL show_as_friend = FALSE;
+ if( i < regionp->mMapAvatarIDs.count())
+ {
+ show_as_friend = is_agent_friend(regionp->mMapAvatarIDs.get(i));
+ }
LLWorldMapView::drawAvatar(
pos_map.mV[VX], pos_map.mV[VY],
show_as_friend ? gFriendMapColor : gAvatarMapColor,
--
cgit v1.2.3