Merge branch 'master' into 20639

David Rowe committed 11 years ago

Commit 83ab37b2 parents 02ae008 5a777b19 files · +116 −220Browse files

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

Unified · Split

interface/src/Menu.cpp+0−2

@@ -249,8 +249,6 @@ Menu::Menu() { · 248 unmodified lines
249	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);	249	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);
250	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,	250	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,
251	avatar, SLOT(updateMotionBehavior()));	251	avatar, SLOT(updateMotionBehavior()));
252	addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,
253	avatar, SLOT(updateMotionBehavior()));
254		252
255	MenuWrapper* viewMenu = addMenu("View");	253	MenuWrapper* viewMenu = addMenu("View");
256		254