summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-07-29 14:56:34 -0400
committerOz Linden <oz@lindenlab.com>2013-07-29 14:56:34 -0400
commitde3d3cf8aac904e0afda356d14af61b44cdb5fb7 (patch)
tree2e2f65dc8ab514cb60e69ae5ab45effd81dd3fa3
parentfd3d20e20dd4af39f5ff0c74f02d75df99e6a33b (diff)
parent0d663f8d2cd5b55300b10b29733fbc8f43fceda1 (diff)
merge storm-1958
-rwxr-xr-xindra/newview/llnetmap.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index dea90b9042..08b5eaedbb 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -343,8 +343,11 @@ void LLNetMap::draw()
// Draw avatars
for (U32 i = 0; i < avatar_ids.size(); i++)
{
- pos_map = globalPosToView(positions[i]);
LLUUID uuid = avatar_ids[i];
+ // Skip self, we'll draw it later
+ if (uuid == gAgent.getID()) continue;
+
+ pos_map = globalPosToView(positions[i]);
bool show_as_friend = (LLAvatarTracker::instance().getBuddyInfo(uuid) != NULL);