History

Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup

Brad Hefta-Gaub committed 11 years ago

Commit 54a45f32 parents 94b273a 096a6cb158 files · +3655 −2709Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−0
@@ -91,6 +91,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 90 unmodified lines
91 _isRunning(false),91 _isRunning(false),
92 _isInitialized(false),92 _isInitialized(false),
93 _controllerScriptingInterface(controllerScriptingInterface),93 _controllerScriptingInterface(controllerScriptingInterface),
94 _timerFunctionMap(),
94 _wantSignals(wantSignals),95 _wantSignals(wantSignals),
95 _fileNameString(fileNameString),96 _fileNameString(fileNameString),
96 _quatLibrary(),97 _quatLibrary(),