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

Atlante45 committed 11 years ago

Commit f77fab22 parents 38729c5 dd2421f60 files · +1336 −1240Browse files

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

Unified · Split

interface/src/Application.cpp+1−0

@@ -3469,6 +3469,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3468 unmodified lines
3469	scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);	3469	scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);
3470		3470
3471	scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());	3471	scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());
		3472	qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
3472		3473
3473	scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager);	3474	scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager);
3474		3475