History

* refactor ScriptCache per FIXMEs * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration

humbletim committed 9 years ago

Commit 831bf931 parent e6142d914 files · +286 −257Browse files

Showing the changes to libraries/networking/src/EntityScriptClient.cpp (1 of 14 files). Show all

Unified · Split

libraries/networking/src/EntityScriptClient.cpp+3−3
@@ -88,7 +88,7 @@ MessageID EntityScriptClient::getEntityServerScriptStatus(QUuid entityID, GetScr · 87 unmodified lines
8888 }
8989 }
9090
91− callback(false, false, ERROR_LOADING_SCRIPT, "");
91+ callback(false, false, EntityScriptStatus::ERROR_LOADING_SCRIPT, "");
9292 return INVALID_MESSAGE_ID;
9393 }
9494
@@ -97,7 +97,7 @@ void EntityScriptClient::handleGetScriptStatusReply(QSharedPointer<ReceivedMessa · 2 unmodified lines
9797
9898 MessageID messageID;
9999 bool isKnown { false };
100− EntityScriptStatus status = ERROR_LOADING_SCRIPT;
100+ EntityScriptStatus status = EntityScriptStatus::ERROR_LOADING_SCRIPT;
101101 QString errorInfo { "" };
102102
103103 message->readPrimitive(&messageID);
@@ -157,7 +157,7 @@ void EntityScriptClient::forceFailureOfPendingRequests(SharedNodePointer node) { · 53 unmodified lines
157157 auto messageMapIt = _pendingEntityScriptStatusRequests.find(node);
158158 if (messageMapIt != _pendingEntityScriptStatusRequests.end()) {
159159 for (const auto& value : messageMapIt->second) {
160− value.second(false, false, ERROR_LOADING_SCRIPT, "");
160+ value.second(false, false, EntityScriptStatus::ERROR_LOADING_SCRIPT, "");
161161 }
162162 messageMapIt->second.clear();
163163 }