From ce660bee9b0df8332595a7619f1b3c0f119ceb47 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 7 Dec 2018 17:31:50 -0800 Subject: [PATCH] fix compile errors after rebase --- interface/src/avatar/MyAvatar.cpp | 2 +- libraries/entities/src/EntityItem.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 9ece7a0ac7..eeca8ec4f4 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1569,7 +1569,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { EntityItemProperties& properties = entitiesToLoad[i]; properties.copyFromJSONString(scriptEngine, _avatarEntityDataSettings[i].get()); // the ClientOnly property can get stripped out elsewhere so we need to always set it true here - properties.setClientOnly(true); + properties.setEntityHostType(entity::HostType::AVATAR); properties.setOwningAvatarID(getID()); } diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index f402aae7d0..b766485450 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -335,9 +335,9 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet APPEND_ENTITY_PROPERTY(PROP_DESCRIPTION, getDescription()); APPEND_ENTITY_PROPERTY(PROP_ACTION_DATA, getDynamicData()); + // convert AVATAR_SELF_ID to actual sessionUUID. QUuid actualParentID = getParentID(); - if (!getClientOnly() && actualParentID == AVATAR_SELF_ID) { - // convert AVATAR_SELF_ID to actual sessionUUID. + if (actualParentID == AVATAR_SELF_ID) { auto nodeList = DependencyManager::get(); actualParentID = nodeList->getSessionUUID(); }