History

Merge branch 'master' of https://github.com/highfidelity/hifi into deference

Andrzej Kapolka committed 12 years ago

Commit 07efda82 parents bfaac9e 896cb7051 files · +1659 −803Browse files

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

Unified · Split

interface/src/Menu.cpp+3−1
@@ -277,7 +277,8 @@ Menu::Menu() : · 276 unmodified lines
277 avatar, SLOT(updateMotionBehaviorsFromMenu()));277 avatar, SLOT(updateMotionBehaviorsFromMenu()));
278 278
279 QMenu* collisionsMenu = avatarMenu->addMenu("Collide With...");279 QMenu* collisionsMenu = avatarMenu->addMenu("Collide With...");
280 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideAsRagdoll);280 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideAsRagdoll, 0, false,
281 avatar, SLOT(onToggleRagdoll()));
281 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithAvatars,282 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithAvatars,
282 0, true, avatar, SLOT(updateCollisionGroups()));283 0, true, avatar, SLOT(updateCollisionGroups()));
283 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithVoxels,284 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithVoxels,
@@ -744,6 +745,7 @@ void Menu::loadSettings(QSettings* settings) { · 460 unmodified lines
744 // TODO: cache more settings in MyAvatar that are checked with very high frequency.745 // TODO: cache more settings in MyAvatar that are checked with very high frequency.
745 MyAvatar* myAvatar = Application::getInstance()->getAvatar();746 MyAvatar* myAvatar = Application::getInstance()->getAvatar();
746 myAvatar->updateCollisionGroups();747 myAvatar->updateCollisionGroups();
748 myAvatar->onToggleRagdoll();
747 749
748 if (lockedSettings) {750 if (lockedSettings) {
749 Application::getInstance()->unlockSettings();751 Application::getInstance()->unlockSettings();