Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -88,7 +88,6 @@ 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), | ||
| 92 | _avatarIdentityTimer(NULL), | 91 | _avatarIdentityTimer(NULL), |
| 93 | _avatarBillboardTimer(NULL), | 92 | _avatarBillboardTimer(NULL), |
| 94 | _timerFunctionMap(), | 93 | _timerFunctionMap(), |
| @@ -103,6 +102,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 8 unmodified lines | |||
| 103 | _vec3Library(), | 102 | _vec3Library(), |
| 104 | _uuidLibrary(), | 103 | _uuidLibrary(), |
| 105 | _animationCache(this), | 104 | _animationCache(this), |
| 105 | _isUserLoaded(false), | ||
| 106 | _arrayBufferClass(new ArrayBufferClass(this)) | 106 | _arrayBufferClass(new ArrayBufferClass(this)) |
| 107 | { | 107 | { |
| 108 | } | 108 | } |
| @@ -114,7 +114,6 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 5 unmodified lines | |||
| 114 | _isRunning(false), | 114 | _isRunning(false), |
| 115 | _isInitialized(false), | 115 | _isInitialized(false), |
| 116 | _isAvatar(false), | 116 | _isAvatar(false), |
| 117 | _isUserLoaded(false), | ||
| 118 | _avatarIdentityTimer(NULL), | 117 | _avatarIdentityTimer(NULL), |
| 119 | _avatarBillboardTimer(NULL), | 118 | _avatarBillboardTimer(NULL), |
| 120 | _timerFunctionMap(), | 119 | _timerFunctionMap(), |
| @@ -129,6 +128,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 8 unmodified lines | |||
| 129 | _vec3Library(), | 128 | _vec3Library(), |
| 130 | _uuidLibrary(), | 129 | _uuidLibrary(), |
| 131 | _animationCache(this), | 130 | _animationCache(this), |
| 131 | _isUserLoaded(false), | ||
| 132 | _arrayBufferClass(new ArrayBufferClass(this)) | 132 | _arrayBufferClass(new ArrayBufferClass(this)) |
| 133 | { | 133 | { |
| 134 | QString scriptURLString = scriptURL.toString(); | 134 | QString scriptURLString = scriptURL.toString(); |