From 63042eea3add8a55144c6f70fd75061cca3e1d1d Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 27 Apr 2017 17:38:17 -0700 Subject: [PATCH] fix flawed fix of bad rebase --- interface/src/Menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index bdbf2847d0..297f6069c7 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -197,7 +197,7 @@ Menu::Menu() { 0, // QML Qt::Key_Apostrophe, qApp, SLOT(resetSensors())); - addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAvatarCollisions, 0, true, + addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableAvatarCollisions, 0, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu())); // Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.