Merge branch 'master' of https://github.com/highfidelity/hifi into 19561

Thijs Wenker committed 12 years ago

Commit 23068b02 parents c016d65 b9dd27623 files · +880 −595Browse files

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

Unified · Split

interface/src/Menu.cpp+2−1

@@ -316,7 +316,8 @@ Menu::Menu() : · 315 unmodified lines
316	addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Visage, 0, true,	316	addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Visage, 0, true,
317	appInstance->getVisage(), SLOT(updateEnabled()));	317	appInstance->getVisage(), SLOT(updateEnabled()));
318	#endif	318	#endif
319		319
		320	addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true);
320	addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);	321	addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);
321		322
322	QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");	323	QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");