Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 12:28:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix compile errors after rebase

Browse source
This commit is contained in:
Andrew Meadows 2018-12-07 17:31:50 -08:00
parent 61b8d005b5
commit ce660bee9b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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());
}

4
libraries/entities/src/EntityItem.cpp
View file

@ -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<NodeList>();
actualParentID = nodeList->getSessionUUID();
}