Merge branch 'master' of https://github.com/worklist/hifi into 19461

Stojce Slavkovski committed 12 years ago

Commit 841d4912 parents 365d1ee 4852aca14 files · +177 −71Browse files

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

Unified · Split

interface/src/Menu.cpp+4−1

@@ -374,7 +374,10 @@ Menu::Menu() : · 373 unmodified lines
374	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true);	374	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true);
375	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::LeapDrive, 0, false);	375	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::LeapDrive, 0, false);
376	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false);	376	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false);
377	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::BallFromHand, 0, false);	377	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::BallFromHand, 0, false);
		378	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false);
		379	addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false);
		380
378		381
379		382
380	QMenu* trackingOptionsMenu = developerMenu->addMenu("Tracking Options");	383	QMenu* trackingOptionsMenu = developerMenu->addMenu("Tracking Options");