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