From 570b872eda156ce49c1b8c11694dacb306d993e0 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 29 Jan 2014 14:43:01 -0800
Subject: [PATCH] Removing build warning about out-of-order initialization in
 class ctor.

---
 interface/src/avatar/Avatar.cpp   | 2 +-
 interface/src/avatar/MyAvatar.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 53775124d6..68f15a3390 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -73,8 +73,8 @@ Avatar::Avatar() :
     _mouseRayOrigin(0.0f, 0.0f, 0.0f),
     _mouseRayDirection(0.0f, 0.0f, 0.0f),
     _moving(false),
-    _collisionFlags(0),
     _owningAvatarMixer(),
+    _collisionFlags(0),
     _initialized(false)
 {
     // we may have been created in the network thread, but we live in the main thread
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 898708fa37..e057c34a2d 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -757,8 +757,13 @@ void MyAvatar::updateAvatarCollisions(float deltaTime) {
     //  Reset detector for nearest avatar
     _distanceToNearestAvatar = std::numeric_limits<float>::max();
     float myRadius = (0.5f + COLLISION_RADIUS_SCALE) * getHeight();
-    foreach (const AvatarSharedPointer& avatarPointer, Application::getInstance()->getAvatarManager().getAvatarHash()) {
+    const AvatarHash& avatars = Application::getInstance()->getAvatarManager().getAvatarHash();
+    foreach (const AvatarSharedPointer& avatarPointer, avatars) {
         Avatar* avatar = static_cast<Avatar*>(avatarPointer.data());
+        if (static_cast<Avatar*>(this) == avatar) {
+            // don't collide with ourselves
+            continue;
+        }
         float distance = glm::length(_position - avatar->_position);        
         if (_distanceToNearestAvatar > distance) {
             _distanceToNearestAvatar = distance;