From caab3afb69c65f7703ef9e90f76ccd7bd303b534 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 13 Feb 2014 14:26:30 -0800
Subject: [PATCH] add menu item for auto adjust LOD

---
 interface/src/Application.cpp | 5 ++++-
 interface/src/Menu.cpp        | 1 +
 interface/src/Menu.h          | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fd4c52d9f2..ab511b62e0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2709,7 +2709,10 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
                 _voxels.render();
                 
                 // double check that our LOD doesn't need to be auto-adjusted
-                Menu::getInstance()->autoAdjustLOD(_fps);
+                // only adjust if our option is set
+                if (Menu::getInstance()->isOptionChecked(MenuOption::AutoAdjustLOD)) {
+                    Menu::getInstance()->autoAdjustLOD(_fps);
+                }
             }
         }
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 63717fdbb5..3eecdd1e96 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -317,6 +317,7 @@ Menu::Menu() :
     addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::VoxelTextures);
     addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::AmbientOcclusion);
     addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DontFadeOnVoxelServerChanges);
+    addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::AutoAdjustLOD);
     addActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
 
     QMenu* voxelProtoOptionsMenu = voxelOptionsMenu->addMenu("Voxel Server Protocol Options");
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 130ce19475..fd9582229f 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -175,6 +175,7 @@ namespace MenuOption {
     const QString AmbientOcclusion = "Ambient Occlusion";
     const QString Avatars = "Avatars";
     const QString Atmosphere = "Atmosphere";
+    const QString AutoAdjustLOD = "Automatically Adjust LOD";
     const QString AutomaticallyAuditTree = "Automatically Audit Tree Stats";
     const QString Bandwidth = "Bandwidth Display";
     const QString BandwidthDetails = "Bandwidth Details";