summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
committerBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
commit3c521d8207092f1c48e158082b88c5e81cc9c440 (patch)
tree36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/newview/llnetmap.cpp
parent74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
viewer-release merge
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);