History

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
192192 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableAvatarCollisions, 0, true,
193193 avatar.get(), SLOT(updateMotionBehaviorFromMenu()));
194194
195+ addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableFlying, 0, true,
196+ avatar.get(), SLOT(setFlyingEnabled(bool)));
197+
195198 // Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.
196199 auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
197200 avatarBookmarks->setupMenus(this, avatarMenu);

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