merge from upstream

Seth Alves committed 9 years ago

Commit c4923192 parents 5a316d6 03851d411 files · +344 −101Browse files

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

Unified · Split

interface/src/Application.cpp+2−0

@@ -1941,6 +1941,8 @@ void Application::initializeUi() { · 1940 unmodified lines
1941	rootContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());	1941	rootContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
1942	rootContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());	1942	rootContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
1943		1943
		1944	rootContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
		1945
1944	rootContext->setContextProperty("Camera", &_myCamera);	1946	rootContext->setContextProperty("Camera", &_myCamera);
1945		1947
1946	#if defined(Q_OS_MAC) \|\| defined(Q_OS_WIN)	1948	#if defined(Q_OS_MAC) \|\| defined(Q_OS_WIN)