Showing the changes to libraries/networking/src/EntityScriptClient.cpp (1 of 14 files). Show all
Unified · Split
| @@ -88,7 +88,7 @@ MessageID EntityScriptClient::getEntityServerScriptStatus(QUuid entityID, GetScr · 87 unmodified lines | |||
| 88 | } | 88 | } |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | callback(false, false, ERROR_LOADING_SCRIPT, ""); | 91 | callback(false, false, EntityScriptStatus::ERROR_LOADING_SCRIPT, ""); |
| 92 | return INVALID_MESSAGE_ID; | 92 | return INVALID_MESSAGE_ID; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| @@ -97,7 +97,7 @@ void EntityScriptClient::handleGetScriptStatusReply(QSharedPointer<ReceivedMessa · 2 unmodified lines | |||
| 97 | 97 | ||
| 98 | MessageID messageID; | 98 | MessageID messageID; |
| 99 | bool isKnown { false }; | 99 | bool isKnown { false }; |
| 100 | EntityScriptStatus status = ERROR_LOADING_SCRIPT; | 100 | EntityScriptStatus status = EntityScriptStatus::ERROR_LOADING_SCRIPT; |
| 101 | QString errorInfo { "" }; | 101 | QString errorInfo { "" }; |
| 102 | 102 | ||
| 103 | message->readPrimitive(&messageID); | 103 | message->readPrimitive(&messageID); |
| @@ -157,7 +157,7 @@ void EntityScriptClient::forceFailureOfPendingRequests(SharedNodePointer node) { · 53 unmodified lines | |||
| 157 | auto messageMapIt = _pendingEntityScriptStatusRequests.find(node); | 157 | auto messageMapIt = _pendingEntityScriptStatusRequests.find(node); |
| 158 | if (messageMapIt != _pendingEntityScriptStatusRequests.end()) { | 158 | if (messageMapIt != _pendingEntityScriptStatusRequests.end()) { |
| 159 | for (const auto& value : messageMapIt->second) { | 159 | for (const auto& value : messageMapIt->second) { |
| 160 | value.second(false, false, ERROR_LOADING_SCRIPT, ""); | 160 | value.second(false, false, EntityScriptStatus::ERROR_LOADING_SCRIPT, ""); |
| 161 | } | 161 | } |
| 162 | messageMapIt->second.clear(); | 162 | messageMapIt->second.clear(); |
| 163 | } | 163 | } |