From cb421fd5b0e5436ae34bad10c442ccc0f4e56017 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Mon, 9 Jul 2018 15:09:45 -0700
Subject: [PATCH] fixed build errors for mac and linux

---
 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 30b5ed9ab9..bee1001771 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -112,14 +112,14 @@ MyAvatar::MyAvatar(QThread* thread) :
     _hmdSensorMatrix(),
     _hmdSensorOrientation(),
     _hmdSensorPosition(),
+    _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE),
     _bodySensorMatrix(),
     _goToPending(false),
     _goToPosition(),
     _goToOrientation(),
     _prevShouldDrawHead(true),
     _audioListenerMode(FROM_HEAD),
-    _hmdAtRestDetector(glm::vec3(0), glm::quat()),
-    _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE)
+    _hmdAtRestDetector(glm::vec3(0), glm::quat())
 {
 
     // give the pointer to our head to inherited _headData variable from AvatarData
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 84867220ca..8ee8f9ffb0 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -883,7 +883,7 @@ public:
     virtual void rebuildCollisionShape() override;
 
     const glm::vec2& getHeadControllerFacingMovingAverage() const { return _headControllerFacingMovingAverage; }
-    const float getCurrentStandingHeight() const { return _currentStandingHeight; }
+    float getCurrentStandingHeight() const { return _currentStandingHeight; }
     void setCurrentStandingHeight(float newMode) { _currentStandingHeight = newMode; }
     const glm::quat getAverageHeadRotation() const { return _averageHeadRotation; }
     void setAverageHeadRotation(glm::quat rotation) { _averageHeadRotation = rotation; }