Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 2 files). Show all
Unified · Split
| @@ -105,8 +105,6 @@ EntityScriptServer::~EntityScriptServer() { · 104 unmodified lines | ||
| 105 | 105 | static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server"; |
| 106 | 106 | |
| 107 | 107 | void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 108 | − // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them | |
| 109 | − // about each other. | |
| 110 | 108 | if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) { |
| 111 | 109 | auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID)); |
| 112 | 110 | |
| @@ -119,8 +117,6 @@ void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<Rec · 6 unmodified lines | ||
| 119 | 117 | } |
| 120 | 118 | |
| 121 | 119 | void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 122 | − // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them | |
| 123 | − // about each other. | |
| 124 | 120 | if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) { |
| 125 | 121 | MessageID messageID; |
| 126 | 122 | message->readPrimitive(&messageID); |
| @@ -190,15 +186,14 @@ void EntityScriptServer::updateEntityPPS() { · 63 unmodified lines | ||
| 190 | 186 | } |
| 191 | 187 | |
| 192 | 188 | void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 193 | − // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them | |
| 194 | − // about each other. | |
| 189 | + bool canRezAny = senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified(); | |
| 195 | 190 | bool enable = false; |
| 196 | 191 | message->readPrimitive(&enable); |
| 197 | 192 | |
| 198 | 193 | auto senderUUID = senderNode->getUUID(); |
| 199 | 194 | auto it = _logListeners.find(senderUUID); |
| 200 | 195 | |
| 201 | − if (enable && senderNode->getCanRez()) { | |
| 196 | + if (enable && canRezAny) { | |
| 202 | 197 | if (it == std::end(_logListeners)) { |
| 203 | 198 | _logListeners.insert(senderUUID); |
| 204 | 199 | qCInfo(entity_script_server) << "Node" << senderUUID << "subscribed to log stream"; |