From 121a5910238ad7a02f100a81892946d0a29e8f07 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 10 Dec 2018 11:52:56 -0800
Subject: [PATCH] delete old AvatarEntities on domain reset on login

---
 interface/src/Application.cpp     | 2 +-
 interface/src/avatar/MyAvatar.cpp | 6 ++++++
 interface/src/avatar/MyAvatar.h   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0fbe9fba94..e0128d0ceb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6784,7 +6784,7 @@ void Application::clearDomainOctreeDetails() {
     DependencyManager::get<recording::ClipCache>()->clearUnusedResources();
 
     // we just deleted all of MyAvatar's AvatarEntities so we flag it to reload from settings
-    getMyAvatar()->rememberToReloadOfAvatarEntityDataFromSettings();
+    getMyAvatar()->rememberToReloadAvatarEntityDataFromSettings();
 }
 
 void Application::domainURLChanged(QUrl domainURL) {
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index af8df7fb71..58b4d5e7d9 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1515,6 +1515,12 @@ void MyAvatar::updateAvatarEntities() {
 }
 
 
+void MyAvatar::rememberToReloadAvatarEntityDataFromSettings() {
+    AvatarEntityMap emptyMap;
+    setAvatarEntityData(emptyMap);
+    _reloadAvatarEntityDataFromSettings = true;
+}
+
 void MyAvatar::loadData() {
     getHead()->setBasePitch(_headPitchSetting.get());
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 17edfc1a3a..21517c5af9 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -1187,7 +1187,7 @@ public:
 
     glm::vec3 getNextPosition() { return _goToPending ? _goToPosition : getWorldPosition(); }
     void updateAvatarEntities() override;
-    void rememberToReloadOfAvatarEntityDataFromSettings() { _reloadAvatarEntityDataFromSettings = true; }
+    void rememberToReloadAvatarEntityDataFromSettings();
 
     /**jsdoc
      * Create a new grab.