From c113dd350eabb6f2c18911d660d70355a8437dcf Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 18 Aug 2014 16:25:38 -0700
Subject: [PATCH] Moved members to MyAvatar

---
 interface/src/avatar/Avatar.cpp | 1 -
 interface/src/avatar/Avatar.h   | 3 ---
 interface/src/avatar/MyAvatar.h | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 498281c98c..41912afd09 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -64,7 +64,6 @@ Avatar::Avatar() :
     _mouseRayDirection(0.0f, 0.0f, 0.0f),
     _moving(false),
     _collisionGroups(0),
-    _player(NULL),
     _initialized(false),
     _shouldRenderBillboard(true)
 {
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 35dec3b8d0..c8ecb23913 100755
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -188,9 +188,6 @@ protected:
     bool _moving; ///< set when position is changing
     
     quint32 _collisionGroups;
-    
-    RecorderPointer _recorder;
-    PlayerPointer _player;
  
     // protected methods...
     glm::vec3 getBodyRightDirection() const { return getOrientation() * IDENTITY_RIGHT; }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 67d19b87eb..2c1695a499 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -205,6 +205,9 @@ private:
     QList<AnimationHandlePointer> _animationHandles;
     PhysicsSimulation _physicsSimulation;
 
+    RecorderPointer _recorder;
+    PlayerPointer _player;
+    
 	// private methods
     float computeDistanceToFloor(const glm::vec3& startPoint);
     void updateOrientation(float deltaTime);