History

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
19411941 rootContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
19421942 rootContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
19431943
1944+ rootContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
1945+
19441946 rootContext->setContextProperty("Camera", &_myCamera);
19451947
19461948 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t