Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove useless added code

Browse source
This commit is contained in:
Seth Alves 2015-04-28 09:18:00 -07:00
parent 32f91a86e7
commit 38ba0ab352
5 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/DomainServer.cpp
View file

@ -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

7
domain-server/src/PendingAssignedNodeData.cpp
View file

@ -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)
{
}

10
domain-server/src/PendingAssignedNodeData.h
View file

@ -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

4
libraries/networking/src/Assignment.cpp
View file

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

10
libraries/networking/src/NodeData.h
View file

@ -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