Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel

Stephen Birarda committed 12 years ago

Commit 52ec9492 parents 1b29444 56c71b677 files · +6137 −978Browse files

Showing the changes to interface/src/Application.cpp (1 of 77 files). Show all

Unified · Split

interface/src/Application.cpp+1−0

@@ -3888,6 +3888,7 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 3887 unmodified lines
3888	connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool)));	3888	connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool)));
3889		3889
3890	scriptEngine->registerGlobalObject("Overlays", &_overlays);	3890	scriptEngine->registerGlobalObject("Overlays", &_overlays);
		3891	qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, RayToOverlayIntersectionResultFromScriptValue);
3891		3892
3892	QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());	3893	QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());
3893	scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,	3894	scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,