From 4665df4d1fd9f314a1c743a92abb5efb7419cffb Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 17:41:20 -0700 Subject: [PATCH] nackdisable to disablenack --- interface/src/Application.cpp | 2 +- interface/src/Menu.cpp | 2 +- interface/src/Menu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 22fe5887fd..3ed2d84df7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -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; } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 9381790a42..be5dd13d1c 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -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"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e1bbb382aa..19e7ef98e2 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -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";