Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all
Unified · Split
| @@ -197,7 +197,7 @@ Menu::Menu() { · 196 unmodified lines | ||
| 197 | 197 | 0, // QML Qt::Key_Apostrophe, |
| 198 | 198 | qApp, SLOT(resetSensors())); |
| 199 | 199 | |
| 200 | − addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true, | |
| 200 | + addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAvatarCollisions, 0, true, | |
| 201 | 201 | avatar.get(), SLOT(updateMotionBehaviorFromMenu())); |
| 202 | 202 | |
| 203 | 203 | // Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here. |
| @@ -532,10 +532,6 @@ Menu::Menu() { · 328 unmodified lines | ||
| 532 | 532 | avatar.get(), SLOT(updateMotionBehaviorFromMenu()), |
| 533 | 533 | UNSPECIFIED_POSITION, "Developer"); |
| 534 | 534 | |
| 535 | − addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAvatarCollisions, 0, true, | |
| 536 | − avatar.get(), SLOT(updateMotionBehaviorFromMenu()), | |
| 537 | − UNSPECIFIED_POSITION, "Developer"); | |
| 538 | − | |
| 539 | 535 | // Developer > Hands >>> |
| 540 | 536 | MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands"); |
| 541 | 537 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false, |