summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-10-24 16:45:38 -0700
committersimon <none@none>2013-10-24 16:45:38 -0700
commit26de32910f99e2522b8e10cf41415b1af2586d5b (patch)
tree57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/newview/llnetmap.cpp
parent93b3f1297ea5377257d14c5214790607e0b1af96 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Pull in viewer-release with fbc / snowstorm
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);