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

Merge pull request #4704 from sethalves/assignment-scripts-can-rez

Browse source 
Assignment scripts can rez
This commit is contained in:
Philip Rosedale 2015-04-28 12:15:19 -07:00
commit 20d77fae3c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -504,7 +504,7 @@ void DomainServer::populateStaticScriptedAssignmentsFromSettings() {
Assignment::AgentType, Assignment::AgentType,
scriptPool); scriptPool);
scriptAssignment->setPayload(scriptURL.toUtf8()); scriptAssignment->setPayload(scriptURL.toUtf8());
// add it to static hash so we know we have to keep giving it back out // add it to static hash so we know we have to keep giving it back out
addStaticAssignmentToAssignmentHash(scriptAssignment); addStaticAssignmentToAssignmentHash(scriptAssignment);
} }
@ -675,6 +675,10 @@ void DomainServer::handleConnectRequest(const QByteArray& packet, const HifiSock
nodeData->setAssignmentUUID(matchingQueuedAssignment->getUUID()); nodeData->setAssignmentUUID(matchingQueuedAssignment->getUUID());
nodeData->setWalletUUID(pendingAssigneeData->getWalletUUID()); nodeData->setWalletUUID(pendingAssigneeData->getWalletUUID());
// always allow assignment clients to create and destroy entities
newNode->setCanAdjustLocks(true);
newNode->setCanRez(true);
// now that we've pulled the wallet UUID and added the node to our list, delete the pending assignee data // now that we've pulled the wallet UUID and added the node to our list, delete the pending assignee data
delete pendingAssigneeData; delete pendingAssigneeData;
} }
@ -2119,10 +2123,10 @@ SharedAssignmentPointer DomainServer::deployableAssignmentForRequest(const Assig
Assignment* assignment = sharedAssignment->data(); Assignment* assignment = sharedAssignment->data();
bool requestIsAllTypes = requestAssignment.getType() == Assignment::AllTypes; bool requestIsAllTypes = requestAssignment.getType() == Assignment::AllTypes;
bool assignmentTypesMatch = assignment->getType() == requestAssignment.getType(); bool assignmentTypesMatch = assignment->getType() == requestAssignment.getType();
bool nietherHasPool = assignment->getPool().isEmpty() && requestAssignment.getPool().isEmpty(); bool neitherHasPool = assignment->getPool().isEmpty() && requestAssignment.getPool().isEmpty();
bool assignmentPoolsMatch = assignment->getPool() == requestAssignment.getPool(); bool assignmentPoolsMatch = assignment->getPool() == requestAssignment.getPool();
if ((requestIsAllTypes || assignmentTypesMatch) && (nietherHasPool || assignmentPoolsMatch)) { if ((requestIsAllTypes || assignmentTypesMatch) && (neitherHasPool || assignmentPoolsMatch)) {
// remove the assignment from the queue // remove the assignment from the queue
SharedAssignmentPointer deployableAssignment = _unfulfilledAssignments.takeAt(sharedAssignment SharedAssignmentPointer deployableAssignment = _unfulfilledAssignments.takeAt(sharedAssignment