From d2d32d0ed9f03740c73dfcd4ef257c012834e5d5 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 6 Feb 2014 14:46:44 -0800
Subject: [PATCH] Changing updateAvatarCollisions() to be
 updateCollisionsWithAvatars()

To agree with names of other similar methods.
---
 interface/src/avatar/MyAvatar.cpp | 4 ++--
 interface/src/avatar/MyAvatar.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 2ea8b94336..f5626cc01a 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -225,7 +225,7 @@ void MyAvatar::simulate(float deltaTime) {
             updateCollisionWithVoxels(deltaTime, radius);
         }
         if (_collisionFlags & COLLISION_GROUP_AVATARS) {
-            updateAvatarCollisions(deltaTime);
+            updateCollisionsWithAvatars(deltaTime);
         }
     }
 
@@ -970,7 +970,7 @@ public:
 
 const float DEFAULT_HAND_RADIUS = 0.1f;
 
-void MyAvatar::updateAvatarCollisions(float deltaTime) {
+void MyAvatar::updateCollisionsWithAvatars(float deltaTime) {
     //  Reset detector for nearest avatar
     _distanceToNearestAvatar = std::numeric_limits<float>::max();
     const AvatarHash& avatars = Application::getInstance()->getAvatarManager().getAvatarHash();
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index faa8cc48e5..e6861b6bae 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -123,7 +123,7 @@ private:
     void renderBody(bool forceRenderHead);
     void updateThrust(float deltaTime);
     void updateHandMovementAndTouching(float deltaTime);
-    void updateAvatarCollisions(float deltaTime);
+    void updateCollisionsWithAvatars(float deltaTime);
     void updateCollisionWithEnvironment(float deltaTime, float radius);
     void updateCollisionWithVoxels(float deltaTime, float radius);
     void applyHardCollision(const glm::vec3& penetration, float elasticity, float damping);