summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-28 12:14:27 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-28 12:14:27 -0700
commit026b528b86a853a923ec87dd3897fe2079cbd539 (patch)
treeb31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/newview/llnetmap.cpp
parentee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Pull merge from lindenlab/viewer-release
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);