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

Andrzej Kapolka committed 12 years ago

Commit 2a327002 parents 0021c77 e59c4a930 files · +685 −331Browse files

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

Unified · Split

interface/src/Menu.cpp+1−2

@@ -195,7 +195,7 @@ Menu::Menu() : · 194 unmodified lines
195	195	addDisabledActionAndSeparator(editMenu, "Physics");
196	196	QObject* avatar = appInstance->getAvatar();
197	197	addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ObeyEnvironmentalGravity, Qt::SHIFT \| Qt::Key_G, true,
198		− avatar, SLOT(updateMotionBehaviors()));
	198	+ avatar, SLOT(updateMotionBehaviorsFromMenu()));
199	199
200	200
201	201	addAvatarCollisionSubMenu(editMenu);
@@ -341,7 +341,6 @@ Menu::Menu() : · 139 unmodified lines
341	341	SLOT(setFilter(bool)));
342	342	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHands, 0, true);
343	343	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false);
344		− addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false);
345	344	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::HandsCollideWithSelf, 0, false);
346	345	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::ShowIKConstraints, 0, false);
347	346	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true);