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

CR feedback

Browse source
This commit is contained in:
Zach Fox 2019-05-13 14:11:34 -07:00
parent d53b528994
commit 55138ed088
2 changed files with 701 additions and 703 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1378
domain-server/resources/describe-settings.json
View file

File diff suppressed because it is too large Load diff

26
libraries/entities/src/EntityTree.cpp
View file

@ -1871,21 +1871,19 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
} }
} }
if (!properties.getPrivateUserData().isEmpty() && validEditPacket) { if (!properties.getPrivateUserData().isEmpty() && validEditPacket && !senderNode->getCanGetAndSetPrivateUserData()) {
if (!senderNode->getCanGetAndSetPrivateUserData()) { if (wantEditLogging()) {
if (wantEditLogging()) { qCDebug(entities) << "User [" << senderNode->getUUID()
qCDebug(entities) << "User [" << senderNode->getUUID() << "] is attempting to set private user data but user isn't allowed; edit rejected...";
<< "] is attempting to set private user data but user isn't allowed; edit rejected..."; }
}
// If this was an add, we also want to tell the client that sent this edit that the entity was not added. // If this was an add, we also want to tell the client that sent this edit that the entity was not added.
if (isAdd) { if (isAdd) {
QWriteLocker locker(&_recentlyDeletedEntitiesLock); QWriteLocker locker(&_recentlyDeletedEntitiesLock);
_recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID); _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
validEditPacket = false; validEditPacket = false;
} else { } else {
suppressDisallowedPrivateUserData = true; suppressDisallowedPrivateUserData = true;
}
} }
} }