Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 14:42:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from ctrlaltdavid/fix/can-rez-attachment

Browse source 
Make granting avatar entities permission more robust
This commit is contained in:
Kalila 2021-03-25 04:49:54 -04:00 committed by GitHub
commit 308b2e08a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -368,12 +368,20 @@ MyAvatar::MyAvatar(QThread* thread) :
connect(&(_skeletonModel->getRig()), &Rig::onLoadFailed, this, &MyAvatar::onLoadFailed);
_characterController.setDensity(_density);
_addAvatarEntitiesToTreeTimer.setSingleShot(true);
connect(&_addAvatarEntitiesToTreeTimer, &QTimer::timeout, [this] {
addAvatarEntitiesToTree();
});
}
MyAvatar::~MyAvatar() {
_lookAtTargetAvatar.reset();
delete _scriptEngine;
_scriptEngine = nullptr;
if (_addAvatarEntitiesToTreeTimer.isActive()) {
_addAvatarEntitiesToTreeTimer.stop();
}
}
QString MyAvatar::getDominantHand() const {
@ -1600,11 +1608,17 @@ void MyAvatar::handleCanRezAvatarEntitiesChanged(bool canRezAvatarEntities) {
if (canRezAvatarEntities) {
// Start displaying avatar entities.
// Allow time for the avatar mixer to be updated with the user's permissions so that it doesn't discard the avatar
// entities sent.
QTimer::singleShot(2 * DOMAIN_SERVER_CHECK_IN_MSECS, this, [this] {
addAvatarEntitiesToTree();
});
// entities sent. In theory, typical worst case would be Interface running on same PC as server and the timings of
// Interface and the avatar mixer sending DomainListRequest to the domain server being such that the avatar sends its
// DomainListRequest and gets its DomainList response DOMAIN_SERVER_CHECK_IN_MSECS after Interface does. Allow extra
// time in case the avatar mixer is bogged down.
_addAvatarEntitiesToTreeTimer.start(5 * DOMAIN_SERVER_CHECK_IN_MSECS); // Single-shot.
} else {
// Cancel any pending addAvatarEntitiesToTree() call.
if (_addAvatarEntitiesToTreeTimer.isActive()) {
_addAvatarEntitiesToTreeTimer.stop();
}
// Stop displaying avatar entities.
removeAvatarEntitiesFromTree();
}

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

@ -3111,6 +3111,8 @@ private:
glm::vec3 _cameraEyesOffset;
float _landingAfterJumpTime { 0.0f };
QTimer _addAvatarEntitiesToTreeTimer;
};
QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);