Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 188 files). Show all
Unified · Split
| @@ -114,7 +114,7 @@ EntityScriptServer::~EntityScriptServer() { · 113 unmodified lines | |||
| 114 | static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server"; | 114 | static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server"; |
| 115 | 115 | ||
| 116 | void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { | 116 | void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 117 | if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) { | 117 | if (senderNode->getCanRez() || senderNode->getCanRezTmp()) { |
| 118 | auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID)); | 118 | auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID)); |
| 119 | 119 | ||
| 120 | if (_entityViewer.getTree() && !_shuttingDown) { | 120 | if (_entityViewer.getTree() && !_shuttingDown) { |
| @@ -125,7 +125,7 @@ void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<Rec · 4 unmodified lines | |||
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { | 127 | void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 128 | if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) { | 128 | if (senderNode->getCanRez() || senderNode->getCanRezTmp()) { |
| 129 | MessageID messageID; | 129 | MessageID messageID; |
| 130 | message->readPrimitive(&messageID); | 130 | message->readPrimitive(&messageID); |
| 131 | auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID)); | 131 | auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID)); |
| @@ -193,7 +193,7 @@ void EntityScriptServer::updateEntityPPS() { · 61 unmodified lines | |||
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { | 195 | void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 196 | bool canRezAny = senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified(); | 196 | bool canRezAny = senderNode->getCanRez() || senderNode->getCanRezTmp(); |
| 197 | bool enable = false; | 197 | bool enable = false; |
| 198 | message->readPrimitive(&enable); | 198 | message->readPrimitive(&enable); |
| 199 | 199 | ||