diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 5090978a72..1ddf1cb7db 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -676,8 +676,6 @@ void DomainServer::handleConnectRequest(const QByteArray& packet, const HifiSock nodeData->setWalletUUID(pendingAssigneeData->getWalletUUID()); // always allow assignment clients to create and destroy entities - nodeData->setCanAdjustLocks(true); - nodeData->setCanRez(true); newNode->setCanAdjustLocks(true); newNode->setCanRez(true); @@ -1058,9 +1056,7 @@ void DomainServer::readAvailableDatagrams() { // add the information for that deployed assignment to the hash of pending assigned nodes PendingAssignedNodeData* pendingNodeData = new PendingAssignedNodeData(assignmentToDeploy->getUUID(), - requestAssignment.getWalletUUID(), - true, true - ); + requestAssignment.getWalletUUID()); _pendingAssignedNodes.insert(uniqueAssignment.getUUID(), pendingNodeData); } else { if (requestAssignment.getType() != Assignment::AgentType diff --git a/domain-server/src/PendingAssignedNodeData.cpp b/domain-server/src/PendingAssignedNodeData.cpp index c4b47fd254..be24498d70 100644 --- a/domain-server/src/PendingAssignedNodeData.cpp +++ b/domain-server/src/PendingAssignedNodeData.cpp @@ -11,12 +11,9 @@ #include "PendingAssignedNodeData.h" -PendingAssignedNodeData::PendingAssignedNodeData(const QUuid& assignmentUUID, const QUuid& walletUUID, - bool canAdjustLocks, bool canRez) : +PendingAssignedNodeData::PendingAssignedNodeData(const QUuid& assignmentUUID, const QUuid& walletUUID) : _assignmentUUID(assignmentUUID), - _walletUUID(walletUUID), - _canAdjustLocks(canAdjustLocks), - _canRez(canRez) + _walletUUID(walletUUID) { } diff --git a/domain-server/src/PendingAssignedNodeData.h b/domain-server/src/PendingAssignedNodeData.h index 17f94d2225..9daa7822c3 100644 --- a/domain-server/src/PendingAssignedNodeData.h +++ b/domain-server/src/PendingAssignedNodeData.h @@ -18,7 +18,7 @@ class PendingAssignedNodeData : public QObject { Q_OBJECT public: - PendingAssignedNodeData(const QUuid& assignmentUUID, const QUuid& walletUUID, bool canAdjustLocks, bool canRez); + PendingAssignedNodeData(const QUuid& assignmentUUID, const QUuid& walletUUID); void setAssignmentUUID(const QUuid& assignmentUUID) { _assignmentUUID = assignmentUUID; } const QUuid& getAssignmentUUID() const { return _assignmentUUID; } @@ -26,17 +26,9 @@ public: void setWalletUUID(const QUuid& walletUUID) { _walletUUID = walletUUID; } const QUuid& getWalletUUID() const { return _walletUUID; } - void setCanAdjustLocks(bool canAdjustLocks) { _canAdjustLocks = canAdjustLocks; } - bool getCanAdjustLocks() { return _canAdjustLocks; } - - void setCanRez(bool canRez) { _canRez = canRez; } - bool getCanRez() { return _canRez; } - private: QUuid _assignmentUUID; QUuid _walletUUID; - bool _canAdjustLocks = false; /// will this node be allowed to adjust locks on entities? - bool _canRez = false; /// will this node be allowed to rez in new entities? }; #endif // hifi_PendingAssignedNodeData_h diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp index 560bce3b91..027cf8aba5 100644 --- a/libraries/networking/src/Assignment.cpp +++ b/libraries/networking/src/Assignment.cpp @@ -153,8 +153,6 @@ QDataStream& operator<<(QDataStream &out, const Assignment& assignment) { if (assignment._command == Assignment::RequestCommand) { out << assignment._walletUUID; } - - out << assignment._canAdjustLocks << assignment._canRez; return out; } @@ -170,7 +168,5 @@ QDataStream& operator>>(QDataStream &in, Assignment& assignment) { in >> assignment._walletUUID; } - in >> assignment._canAdjustLocks >> assignment._canRez; - return in; } diff --git a/libraries/networking/src/NodeData.h b/libraries/networking/src/NodeData.h index e5e7925280..b865e444a9 100644 --- a/libraries/networking/src/NodeData.h +++ b/libraries/networking/src/NodeData.h @@ -26,18 +26,8 @@ public: QMutex& getMutex() { return _mutex; } - void setCanAdjustLocks(bool canAdjustLocks) { _canAdjustLocks = canAdjustLocks; } - bool getCanAdjustLocks() { return _canAdjustLocks; } - - void setCanRez(bool canRez) { _canRez = canRez; } - bool getCanRez() { return _canRez; } - private: QMutex _mutex; - -protected: - bool _canAdjustLocks = false; /// will this node be allowed to adjust locks on entities? - bool _canRez = false; /// will this node be allowed to rez in new entities? }; #endif // hifi_NodeData_h