Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 20:34:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

delete old AvatarEntities on domain reset on login

Browse source
This commit is contained in:
Andrew Meadows 2018-12-10 11:52:56 -08:00
parent c4115bece3
commit 121a591023
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -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) {

6
interface/src/avatar/MyAvatar.cpp
View file

@ -1515,6 +1515,12 @@ void MyAvatar::updateAvatarEntities() {
}
void MyAvatar::rememberToReloadAvatarEntityDataFromSettings() {
AvatarEntityMap emptyMap;
setAvatarEntityData(emptyMap);
_reloadAvatarEntityDataFromSettings = true;
}
void MyAvatar::loadData() {
getHead()->setBasePitch(_headPitchSetting.get());

2
interface/src/avatar/MyAvatar.h
View file

@ -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.