Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:29:02 +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

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

@ -1871,8 +1871,7 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
}
}
if (!properties.getPrivateUserData().isEmpty() && validEditPacket) {
if (!senderNode->getCanGetAndSetPrivateUserData()) {
if (!properties.getPrivateUserData().isEmpty() && validEditPacket && !senderNode->getCanGetAndSetPrivateUserData()) {
if (wantEditLogging()) {
qCDebug(entities) << "User [" << senderNode->getUUID()
<< "] is attempting to set private user data but user isn't allowed; edit rejected...";
@ -1887,7 +1886,6 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
suppressDisallowedPrivateUserData = true;
}
}
}
if (!isClone) {
if ((isAdd || properties.lifetimeChanged()) &&