History

Revert "Worklist #20074"

Brad Hefta-Gaub committed 12 years ago

Commit 1c4e71e1 parent 7b5d2ef6 files · +17 −113Browse files

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

Unified · Split

interface/src/Menu.cpp+0−6
@@ -105,7 +105,6 @@ Menu::Menu() : · 104 unmodified lines
105 _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),105 _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
106 _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),106 _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
107 _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE),107 _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE),
108 _oculusUIMaxFPS(DEFAULT_OCULUS_UI_MAX_FPS),
109 _sixenseReticleMoveSpeed(DEFAULT_SIXENSE_RETICLE_MOVE_SPEED),108 _sixenseReticleMoveSpeed(DEFAULT_SIXENSE_RETICLE_MOVE_SPEED),
110 _invertSixenseButtons(DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS),109 _invertSixenseButtons(DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS),
111 _automaticAvatarLOD(true),110 _automaticAvatarLOD(true),
@@ -784,8 +783,6 @@ void Menu::loadSettings(QSettings* settings) { · 672 unmodified lines
784 settings->endGroup();783 settings->endGroup();
785 784
786 _walletPrivateKey = settings->value("privateKey").toByteArray();785 _walletPrivateKey = settings->value("privateKey").toByteArray();
787
788 _oculusUIMaxFPS = loadSetting(settings, "oculusUIMaxFPS", 0.0f);
789 786
790 scanMenuBar(&loadAction, settings);787 scanMenuBar(&loadAction, settings);
791 Application::getInstance()->getAvatar()->loadData(settings);788 Application::getInstance()->getAvatar()->loadData(settings);
@@ -847,9 +844,6 @@ void Menu::saveSettings(QSettings* settings) { · 55 unmodified lines
847 settings->setValue("viewFrustumOffsetUp", _viewFrustumOffset.up);844 settings->setValue("viewFrustumOffsetUp", _viewFrustumOffset.up);
848 settings->endGroup();845 settings->endGroup();
849 settings->setValue("privateKey", _walletPrivateKey);846 settings->setValue("privateKey", _walletPrivateKey);
850
851 // Oculus Rift settings
852 settings->setValue("oculusUIMaxFPS", _oculusUIMaxFPS);
853 847
854 scanMenuBar(&saveAction, settings);848 scanMenuBar(&saveAction, settings);
855 Application::getInstance()->getAvatar()->saveData(settings);849 Application::getInstance()->getAvatar()->saveData(settings);