From 17c961f1b0d04e764308ac6e2267f87fffb78bd9 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 20 May 2013 12:34:15 -0700
Subject: [PATCH] merge

---
 libraries/avatars/src/AvatarData.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 33d2b5205e..a2b210078b 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -29,24 +29,22 @@ enum KeyState
 class AvatarData : public AgentData {
 public:
     AvatarData();
-    ~AvatarData();
-    
     AvatarData* clone() const;
     
-    const glm::vec3& getPosition() const;
-    void setPosition(glm::vec3 position);
-    void setHandPosition(glm::vec3 handPosition);
+    const glm::vec3& getPosition() const { return _position; }
+    void setPosition(const glm::vec3 position) { _position = position; }
+    void setHandPosition(const glm::vec3 handPosition) { _handPosition = handPosition; }    
     
     int getBroadcastData(unsigned char* destinationBuffer);
     int parseData(unsigned char* sourceBuffer, int numBytes);
     
     //  Body Rotation
-    float getBodyYaw();
-    float getBodyPitch();
-    float getBodyRoll();
-    void  setBodyYaw(float bodyYaw);
-    void  setBodyPitch(float bodyPitch);
-    void  setBodyRoll(float bodyRoll);
+    float getBodyYaw() const { return _bodyYaw; }
+    void setBodyYaw(float bodyYaw) { _bodyYaw = bodyYaw; }
+    float getBodyPitch() const { return _bodyPitch; }
+    void setBodyPitch(float bodyPitch) { _bodyPitch = bodyPitch; }
+    float getBodyRoll() const {return _bodyRoll; }
+    void setBodyRoll(float bodyRoll) { _bodyRoll = bodyRoll; }
 
     // Head Rotation
     void setHeadPitch(float p);
@@ -110,6 +108,10 @@ public:
     void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; }
     
 protected:
+    // privatize the copy constructor and assignment operator so they cannot be called
+    AvatarData(const AvatarData&);
+    AvatarData& operator= (const AvatarData&);
+
     glm::vec3 _position;
     glm::vec3 _handPosition;