History

Build fixes for change in getMyAvatar() from DepenencyManager

It now returns a smart_ptr, not a raw pointer.

Anthony J. Thibault committed 10 years ago

Commit 2fdd5e41 parent cc7a6ad2 files · +6 −6Browse files

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

Unified · Split

interface/src/Menu.cpp+4−4
@@ -517,9 +517,9 @@ Menu::Menu() { · 516 unmodified lines
517 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderOtherLookAtVectors, 0, false);517 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderOtherLookAtVectors, 0, false);
518 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);518 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
519 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayLeftFootTrace, 0, false,519 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayLeftFootTrace, 0, false,
520 avatar, SLOT(setEnableDebugDrawLeftFootTrace(bool)));520 avatar.get(), SLOT(setEnableDebugDrawLeftFootTrace(bool)));
521 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayRightFootTrace, 0, false,521 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayRightFootTrace, 0, false,
522 avatar, SLOT(setEnableDebugDrawRightFootTrace(bool)));522 avatar.get(), SLOT(setEnableDebugDrawRightFootTrace(bool)));
523 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,523 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,
524 avatar.get(), SLOT(setEnableDebugDrawDefaultPose(bool)));524 avatar.get(), SLOT(setEnableDebugDrawDefaultPose(bool)));
525 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawAnimPose, 0, false,525 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawAnimPose, 0, false,
@@ -553,11 +553,11 @@ Menu::Menu() { · 27 unmodified lines
553 553
554 // KINEMATIC_CONTROLLER_HACK554 // KINEMATIC_CONTROLLER_HACK
555 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::MoveKinematically, 0, false,555 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::MoveKinematically, 0, false,
556 avatar, SLOT(updateMotionBehaviorFromMenu()),556 avatar.get(), SLOT(updateMotionBehaviorFromMenu()),
557 UNSPECIFIED_POSITION, "Developer");557 UNSPECIFIED_POSITION, "Developer");
558 558
559 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableVerticalComfortMode, 0, false,559 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableVerticalComfortMode, 0, false,
560 avatar, SLOT(setEnableVerticalComfortMode(bool)));560 avatar.get(), SLOT(setEnableVerticalComfortMode(bool)));
561 561
562 // Developer > Hands >>>562 // Developer > Hands >>>
563 MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");563 MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");