From 6b7a3918858c13ed14252498f9e77a0ff0f8ae0e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 29 Jan 2015 16:00:57 -0800
Subject: [PATCH] move a couple avatar initialisations outside avatar maanger

---
 interface/src/avatar/Avatar.h              |  4 ----
 interface/src/avatar/AvatarManager.cpp     |  2 --
 libraries/audio-client/src/AudioClient.cpp |  2 +-
 libraries/avatars/src/AvatarData.h         | 10 +++++++---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index f975e8dac3..b0b999fbbc 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -55,10 +55,6 @@ enum ScreenTintLayer {
     NUM_SCREEN_TINT_LAYERS
 };
 
-// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found).
-// This is the start location in the Sandbox (xyz: 6270, 211, 6000).
-const glm::vec3 START_LOCATION(0.38269043f * TREE_SCALE, 0.01287842f * TREE_SCALE, 0.36621094f * TREE_SCALE);
-
 class Texture;
 
 class Avatar : public AvatarData {
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 8c13dd3c54..ee9172a112 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -56,8 +56,6 @@ AvatarManager::AvatarManager(QObject* parent) :
 
 void AvatarManager::init() {
     _myAvatar->init();
-    _myAvatar->setPosition(START_LOCATION);
-    _myAvatar->setDisplayingLookatVectors(false);
     _avatarHash.insert(MY_AVATAR_KEY, _myAvatar);
 }
 
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 9628ebe970..9608a239ab 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -923,7 +923,7 @@ void AudioClient::parseAudioEnvironmentData(const QByteArray &packet) {
 
 void AudioClient::toggleMute() {
     _muted = !_muted;
-    muteToggled();
+    emit muteToggled();
 }
 
 void AudioClient::setIsStereoInput(bool isStereoInput) {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index a429a7af93..7feb122d81 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -110,6 +110,10 @@ const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000;
 const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/models/heads/defaultAvatar_head.fst");
 const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/models/skeletons/defaultAvatar_body.fst");
 
+// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found).
+// This is the start location in the Sandbox (xyz: 6270, 211, 6000).
+const glm::vec3 START_LOCATION(0.38269043f * TREE_SCALE, 0.01287842f * TREE_SCALE, 0.36621094f * TREE_SCALE);
+
 enum KeyState {
     NO_KEY_DOWN = 0,
     INSERT_KEY_DOWN,
@@ -329,7 +333,7 @@ public slots:
     
 protected:
     QUuid _sessionUUID;
-    glm::vec3 _position;
+    glm::vec3 _position = START_LOCATION;
     glm::vec3 _handPosition;
     
     Referential* _referential;
@@ -357,8 +361,8 @@ protected:
     HeadData* _headData;
     HandData* _handData;
 
-    QUrl _faceModelURL;
-    QUrl _skeletonModelURL;
+    QUrl _faceModelURL = DEFAULT_HEAD_MODEL_URL;
+    QUrl _skeletonModelURL = DEFAULT_BODY_MODEL_URL;
     QVector<AttachmentData> _attachmentData;
     QString _displayName;