summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-10-15 17:47:37 -0400
committerOz Linden <oz@lindenlab.com>2013-10-15 17:47:37 -0400
commit9c313aea13c70db145d3f2ba840fdc34ed8c8adf (patch)
tree72b76053aac0fedf411145b0427b2239971034b1 /indra/newview/llnetmap.cpp
parent1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff)
parent8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff)
merge changes for DRTVWR-336
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);