nackdisable to disablenack

This commit is contained in:
wangyix 2014-06-09 17:41:20 -07:00
parent de61029f05
commit 4665df4d1f
3 changed files with 3 additions and 3 deletions

View file

@ -2109,7 +2109,7 @@ void Application::updateMyAvatar(float deltaTime) {
void Application::sendNack() {
if (Menu::getInstance()->isOptionChecked(MenuOption::NackDisable)) {
if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNack)) {
return;
}

View file

@ -393,7 +393,7 @@ Menu::Menu() :
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true);
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlternateIK, 0, false);
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::NackDisable, 0, false);
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisableNack, 0, false);
addDisabledActionAndSeparator(developerMenu, "Testing");

View file

@ -320,6 +320,7 @@ namespace MenuOption {
const QString DecreaseAvatarSize = "Decrease Avatar Size";
const QString DecreaseVoxelSize = "Decrease Voxel Size";
const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
const QString DisableNack = "Disable NACK Packets";
const QString DisplayFrustum = "Display Frustum";
const QString DisplayHands = "Display Hands";
const QString DisplayHandTargets = "Display Hand Targets";
@ -373,7 +374,6 @@ namespace MenuOption {
const QString MoveWithLean = "Move with Lean";
const QString MuteAudio = "Mute Microphone";
const QString MuteEnvironment = "Mute Environment";
const QString NackDisable = "Disable NACK Packets";
const QString NameLocation = "Name this location";
const QString NewVoxelCullingMode = "New Voxel Culling Mode";
const QString OctreeStats = "Voxel and Particle Statistics";