diff options
| author | Melinda Green <melinda@lindenlab.com> | 2007-09-21 00:09:08 +0000 |
|---|---|---|
| committer | Melinda Green <melinda@lindenlab.com> | 2007-09-21 00:09:08 +0000 |
| commit | 99d1eb7261e6fa21c9b30a3c0fb256029481db42 (patch) | |
| tree | 8b385b14a74b4ccee86a163e3ffb325ff6624ad5 /indra/newview | |
| parent | 9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 (diff) | |
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.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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, |