Merge branch 'master' into 21396

David Rowe committed 9 years ago

Commit 9d0407c2 parents b26f5c5 8510b6049 files · +822 −255Browse files

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

Unified · Split

interface/src/Menu.cpp+3−0

@@ -192,6 +192,9 @@ Menu::Menu() { · 191 unmodified lines
192	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableAvatarCollisions, 0, true,	192	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableAvatarCollisions, 0, true,
193	avatar.get(), SLOT(updateMotionBehaviorFromMenu()));	193	avatar.get(), SLOT(updateMotionBehaviorFromMenu()));
194		194
		195	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableFlying, 0, true,
		196	avatar.get(), SLOT(setFlyingEnabled(bool)));
		197
195	// Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.	198	// Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.
196	auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();	199	auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
197	avatarBookmarks->setupMenus(this, avatarMenu);	200	avatarBookmarks->setupMenus(this, avatarMenu);