History

Merge pull request #9685 from humbletim/21114-part2

CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions

Ryan Huffman committed 9 years ago

Commit a744e0d2 parents 2b11740 2505a8927 files · +1124 −238Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 27 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+2−2
@@ -394,7 +394,7 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) { · 393 unmodified lines
394394 }
395395
396396 void EntityScriptServer::resetEntitiesScriptEngine() {
397− auto engineName = QString("Entities %1").arg(++_entitiesScriptEngineCount);
397+ auto engineName = QString("about:Entities %1").arg(++_entitiesScriptEngineCount);
398398 auto newEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName));
399399
400400 auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor);
@@ -477,7 +477,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const · 76 unmodified lines
477477 if (!scriptUrl.isEmpty()) {
478478 scriptUrl = ResourceManager::normalizeURL(scriptUrl);
479479 qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID;
480− ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);
480+ _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload);
481481 }
482482 }
483483 }