summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
committerDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
commit7866356d7719413b952787a509ebd3c4ce8d39b1 (patch)
treea200c96afd5ab8ad6da64c14ec6211aac9d5c65f /indra/newview/llnetmap.cpp
parent81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Merge viewer-release => sunshine-internal
Diffstat (limited to 'indra/newview/llnetmap.cpp')
-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);