diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
| commit | 7bbb802385e58b1f9c2e7b04ad2f3f20c125be44 (patch) | |
| tree | 88ccb7d4cc17bb9615ee61ef001f8cb8963252fb /indra/newview/llnetmap.cpp | |
| parent | a6faeac94530e59d2c2a56df63a1d78e00fb0247 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge with 3.6.9
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rwxr-xr-x | indra/newview/llnetmap.cpp | 5 |
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); |