Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties

Ryan Huffman committed 12 years ago

Commit 28eebd32 parents 604b1b6 1b6bed849 files · +601 −89Browse files

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

Unified · Split

interface/src/Application.cpp+3−1

@@ -3906,7 +3906,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3905 unmodified lines
3906	connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool)));	3906	connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool)));
3907		3907
3908	scriptEngine->registerGlobalObject("Overlays", &_overlays);	3908	scriptEngine->registerGlobalObject("Overlays", &_overlays);
3909	qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, RayToOverlayIntersectionResultFromScriptValue);	3909	qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
		3910	qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
		3911	RayToOverlayIntersectionResultFromScriptValue);
3910		3912
3911	QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());	3913	QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());
3912	scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,	3914	scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,