clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared

interface/src/Application.cpp

@@ -5495,6 +5495,8 @@ void Application::clearDomainOctreeDetails() {
     DependencyManager::get<ModelCache>()->clearUnusedResources();
     DependencyManager::get<SoundCache>()->clearUnusedResources();
     DependencyManager::get<TextureCache>()->clearUnusedResources();
+
+    getMyAvatar()->setAvatarEntityDataChanged(true);
 }
 
 void Application::clearDomainAvatars() {

interface/src/avatar/MyAvatar.cpp

@@ -951,11 +951,7 @@ void MyAvatar::saveData() {
     }
     settings.endArray();
 
-    if (_avatarEntityData.size() == 0) {
-        // HACK: manually remove empty 'avatarEntityData' else deleted avatarEntityData may show up in settings file
-        settings.remove("avatarEntityData");
-    }
-
+    settings.remove("avatarEntityData");
     settings.beginWriteArray("avatarEntityData");
     int avatarEntityIndex = 0;
     auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();

libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp

@@ -198,6 +198,11 @@ void Avatar::setTargetScale(float targetScale) {
     }
 }
 
+void Avatar::setAvatarEntityDataChanged(bool value) {
+    AvatarData::setAvatarEntityDataChanged(value);
+    _avatarEntityDataHashes.clear();
+}
+
 void Avatar::updateAvatarEntities() {
     PerformanceTimer perfTimer("attachments");
     // - if queueEditEntityMessage sees clientOnly flag it does _myAvatar->updateAvatarEntity()

libraries/avatars-renderer/src/avatars-renderer/Avatar.h

@@ -265,6 +265,8 @@ public:
     virtual float getModelScale() const { return _modelScale; }
     virtual void setModelScale(float scale) { _modelScale = scale; }
 
+    virtual void setAvatarEntityDataChanged(bool value) override;
+
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead

libraries/avatars/src/AvatarData.h

@@ -603,7 +603,7 @@ public:
 
     Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const;
     Q_INVOKABLE void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
-    void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
+    virtual void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
     void insertDetachedEntityID(const QUuid entityID);
     AvatarEntityIDs getAndClearRecentlyDetachedIDs();