Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:53:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add check for SELF_ID

Browse source
This commit is contained in:
Alexander Ivash 2018-07-20 19:33:16 +03:00
parent 849c91d8f6
commit f5717b7648
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/AvatarBookmarks.cpp
View file

@ -145,7 +145,8 @@ void AvatarBookmarks::removeBookmark(const QString& bookmarkName) {
} }
bool isWearableEntity(const EntityItemPointer& entity) { bool isWearableEntity(const EntityItemPointer& entity) {
return entity->isVisible() && entity->getParentJointIndex() != INVALID_JOINT_INDEX && entity->getParentID() == DependencyManager::get<NodeList>()->getSessionUUID(); return entity->isVisible() && entity->getParentJointIndex() != INVALID_JOINT_INDEX &&
(entity->getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || entity->getParentID() == DependencyManager::get<AvatarManager>()->getMyAvatar()->getSelfID());
} }
void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) { void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) {

3
scripts/system/avatarapp.js
View file

@ -31,7 +31,8 @@ function executeLater(callback) {
var INVALID_JOINT_INDEX = -1 var INVALID_JOINT_INDEX = -1
function isWearable(avatarEntity) { function isWearable(avatarEntity) {
return avatarEntity.properties.visible === true && avatarEntity.properties.parentJointIndex !== INVALID_JOINT_INDEX && avatarEntity.properties.parentID === MyAvatar.sessionUUID; return avatarEntity.properties.visible === true && avatarEntity.properties.parentJointIndex !== INVALID_JOINT_INDEX &&
(avatarEntity.properties.parentID === MyAvatar.sessionUUID || avatarEntity.properties.parentID === MyAvatar.SELF_ID);
} }
function getMyAvatarWearables() { function getMyAvatarWearables() {