History

more CR feedback

Brad Hefta-Gaub committed 10 years ago

Commit 9e13b1b1 parent 374ba101 file · +2 −2Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -1049,8 +1049,8 @@ void ScriptEngine::forwardHandlerCall(const EntityItemID& entityID, const QStrin · 1048 unmodified lines
1049// since all of these operations can be asynch we will always do the actual work in the response handler1049// since all of these operations can be asynch we will always do the actual work in the response handler
1050// for the download1050// for the download
1051void ScriptEngine::loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload) {1051void ScriptEngine::loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload) {
1052 // NOTE: If the script content is not currently in the caceh, The LAMBDA here, will be called on the Main Thread1052 // NOTE: If the script content is not currently in the cache, the LAMBDA here will be called on the Main Thread
1053 // which means we're guarenteed that it's not the correct thread for the ScriptEngine. This means1053 // which means we're guaranteed that it's not the correct thread for the ScriptEngine. This means
1054 // when we get into entityScriptContentAvailable() we will likely invokeMethod() to get it over1054 // when we get into entityScriptContentAvailable() we will likely invokeMethod() to get it over
1055 // to the "Entities" ScriptEngine thread.1055 // to the "Entities" ScriptEngine thread.
1056 DependencyManager::get<ScriptCache>()->getScriptContents(entityScript, [theEngine, entityID](const QString& scriptOrURL, const QString& contents, bool isURL, bool success) {1056 DependencyManager::get<ScriptCache>()->getScriptContents(entityScript, [theEngine, entityID](const QString& scriptOrURL, const QString& contents, bool isURL, bool success) {