History

Make scripts loaded with Script.load() not persist

David Rowe committed 12 years ago

Commit 5ebe6961 parent 7b1ed497 files · +36 −19Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−1
@@ -88,6 +88,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 87 unmodified lines
88 _isRunning(false),88 _isRunning(false),
89 _isInitialized(false),89 _isInitialized(false),
90 _isAvatar(false),90 _isAvatar(false),
91 _isUserLoaded(false),
91 _avatarIdentityTimer(NULL),92 _avatarIdentityTimer(NULL),
92 _avatarBillboardTimer(NULL),93 _avatarBillboardTimer(NULL),
93 _timerFunctionMap(),94 _timerFunctionMap(),
@@ -113,6 +114,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 19 unmodified lines
113 _isRunning(false),114 _isRunning(false),
114 _isInitialized(false),115 _isInitialized(false),
115 _isAvatar(false),116 _isAvatar(false),
117 _isUserLoaded(false),
116 _avatarIdentityTimer(NULL),118 _avatarIdentityTimer(NULL),
117 _avatarBillboardTimer(NULL),119 _avatarBillboardTimer(NULL),
118 _timerFunctionMap(),120 _timerFunctionMap(),
@@ -708,7 +710,7 @@ void ScriptEngine::include(const QString& includeFile) { · 589 unmodified lines
708 710
709void ScriptEngine::load(const QString& loadFile) {711void ScriptEngine::load(const QString& loadFile) {
710 QUrl url = resolveInclude(loadFile);712 QUrl url = resolveInclude(loadFile);
711 emit loadScript(url.toString());713 emit loadScript(url.toString(), false);
712}714}
713 715
714void ScriptEngine::nodeKilled(SharedNodePointer node) {716void ScriptEngine::nodeKilled(SharedNodePointer node) {