History

merge fix

Philip Rosedale committed 12 years ago

Commit da0b36e2 parents 691b1d6 e59c4a934 files · +794 −364Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1
@@ -190,7 +190,7 @@ Menu::Menu() : · 189 unmodified lines
190 addDisabledActionAndSeparator(editMenu, "Physics");190 addDisabledActionAndSeparator(editMenu, "Physics");
191 QObject* avatar = appInstance->getAvatar();191 QObject* avatar = appInstance->getAvatar();
192 addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ObeyEnvironmentalGravity, Qt::SHIFT | Qt::Key_G, true, 192 addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ObeyEnvironmentalGravity, Qt::SHIFT | Qt::Key_G, true,
193 avatar, SLOT(updateMotionBehaviors()));193 avatar, SLOT(updateMotionBehaviorsFromMenu()));
194 194
195 195
196 addAvatarCollisionSubMenu(editMenu);196 addAvatarCollisionSubMenu(editMenu);