From ffda98fe0b160083f7ab3bea64811f8271350a9f Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 17:50:29 -0700 Subject: [PATCH] var name change again --- 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 3ed2d84df7..3cfec3190e 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::DisableNack)) { + if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) { return; } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index be5dd13d1c..42874ea02e 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::DisableNack, 0, false); + addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisableNackPackets, 0, false); addDisabledActionAndSeparator(developerMenu, "Testing"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 19e7ef98e2..03ffa0b848 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -320,7 +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 DisableNackPackets = "Disable NACK Packets"; const QString DisplayFrustum = "Display Frustum"; const QString DisplayHands = "Display Hands"; const QString DisplayHandTargets = "Display Hand Targets";