Merge pull request #4274 from sethalves/lockers-can-change-metavoxels

if a MetavoxelEditMessage is received from a node which is not an editer...
This commit is contained in:
Andrew Meadows 2015-02-12 09:51:25 -08:00
commit 9f62e8bbf6

View file

@ -271,9 +271,10 @@ void MetavoxelSession::handleMessage(const QVariant& message) {
_lodPacketNumber = _sequencer.getIncomingPacketNumber();
} else if (userType == MetavoxelEditMessage::Type) {
QMetaObject::invokeMethod(_sender->getServer(), "applyEdit", Q_ARG(const MetavoxelEditMessage&,
message.value<MetavoxelEditMessage>()));
if (_node->getCanAdjustLocks()) {
QMetaObject::invokeMethod(_sender->getServer(), "applyEdit",
Q_ARG(const MetavoxelEditMessage&, message.value<MetavoxelEditMessage>()));
}
} else if (userType == QMetaType::QVariantList) {
foreach (const QVariant& element, message.toList()) {
handleMessage(element);