From 66f5181a17fbe49a42bf864679f3af08a85bcb08 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Thu, 9 Jun 2011 23:40:21 +1000 Subject: [PATCH] Update the basic graphics detail slider. Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low. --- linden/indra/newview/CMakeLists.txt | 8 +- .../newview/app_settings/high_graphics.xml | 39 ---------- .../newview/app_settings/low_graphics.xml | 39 ---------- .../newview/app_settings/mid_graphics.xml | 39 ---------- .../newview/app_settings/ultra_graphics.xml | 39 ---------- linden/indra/newview/featuretable.txt | 26 +++---- linden/indra/newview/featuretable_linux.txt | 24 +++--- linden/indra/newview/featuretable_mac.txt | 78 +++++++++---------- 8 files changed, 66 insertions(+), 226 deletions(-) delete mode 100644 linden/indra/newview/app_settings/high_graphics.xml delete mode 100644 linden/indra/newview/app_settings/low_graphics.xml delete mode 100644 linden/indra/newview/app_settings/mid_graphics.xml delete mode 100644 linden/indra/newview/app_settings/ultra_graphics.xml diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 907fa5c8..540754d2 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1204,19 +1204,19 @@ set(viewer_APPSETTINGS_FILES app_settings/cmd_line.xml app_settings/default_grids.xml app_settings/grass.xml - app_settings/high_graphics.xml +# app_settings/high_graphics.xml app_settings/keys.ini app_settings/keywords.ini app_settings/logcontrol.xml - app_settings/low_graphics.xml - app_settings/mid_graphics.xml +# app_settings/low_graphics.xml +# app_settings/mid_graphics.xml app_settings/settings.xml app_settings/settings_crash_behavior.xml app_settings/settings_files.xml app_settings/settings_per_account.xml app_settings/std_bump.ini app_settings/trees.xml - app_settings/ultra_graphics.xml +# app_settings/ultra_graphics.xml app_settings/viewerart.xml ${CMAKE_SOURCE_DIR}/../etc/message.xml ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg diff --git a/linden/indra/newview/app_settings/high_graphics.xml b/linden/indra/newview/app_settings/high_graphics.xml deleted file mode 100644 index 6368f709..00000000 --- a/linden/indra/newview/app_settings/high_graphics.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/app_settings/low_graphics.xml b/linden/indra/newview/app_settings/low_graphics.xml deleted file mode 100644 index 3f67a70d..00000000 --- a/linden/indra/newview/app_settings/low_graphics.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/app_settings/mid_graphics.xml b/linden/indra/newview/app_settings/mid_graphics.xml deleted file mode 100644 index 12da77da..00000000 --- a/linden/indra/newview/app_settings/mid_graphics.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/app_settings/ultra_graphics.xml b/linden/indra/newview/app_settings/ultra_graphics.xml deleted file mode 100644 index f16ec6c3..00000000 --- a/linden/indra/newview/app_settings/ultra_graphics.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt index a31cd717..6da62f0e 100644 --- a/linden/indra/newview/featuretable.txt +++ b/linden/indra/newview/featuretable.txt @@ -28,7 +28,7 @@ RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 RenderCubeMap 1 1 -RenderFarClip 1 256 +RenderFarClip 1 1024 RenderFlexTimeFactor 1 1.0 RenderFogRatio 1 4.0 RenderGamma 1 0 @@ -41,10 +41,10 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 3 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 +RenderTreeLODFactor 1 12.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 -RenderVolumeLODFactor 1 2.0 +RenderVolumeLODFactor 1 4.0 RenderWaterReflections 1 1 UseStartScreen 1 1 UseOcclusion 1 1 @@ -54,8 +54,6 @@ WLSkyDetail 1 128 Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderTextureMemoryMultiple 1 1.0 -RenderShaderLightingMaxLevel 1 3 - // // Low Graphics Settings @@ -74,7 +72,7 @@ RenderObjectBump 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 RenderTerrainLODFactor 1 1 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 2.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -90,7 +88,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0.5 RenderAvatarVP 1 1 -RenderFarClip 1 96 +RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 8 RenderLightingDetail 1 1 @@ -99,7 +97,7 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 1.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 4.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -115,7 +113,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 128 +RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -124,9 +122,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 8.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 1.125 +RenderVolumeLODFactor 1 2.0 RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 @@ -140,7 +138,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 256 +RenderFarClip 1 1024 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -149,9 +147,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 3 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 +RenderTreeLODFactor 1 12.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 2.0 +RenderVolumeLODFactor 1 4.0 RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt index 57d712ed..c5c685cc 100644 --- a/linden/indra/newview/featuretable_linux.txt +++ b/linden/indra/newview/featuretable_linux.txt @@ -28,7 +28,7 @@ RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 RenderCubeMap 1 1 -RenderFarClip 1 256 +RenderFarClip 1 1024 RenderFlexTimeFactor 1 1.0 RenderFogRatio 1 4.0 RenderGamma 1 0 @@ -41,10 +41,10 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 3 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 +RenderTreeLODFactor 1 12.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 -RenderVolumeLODFactor 1 2.0 +RenderVolumeLODFactor 1 4.0 RenderWaterReflections 1 1 UseStartScreen 1 1 UseOcclusion 1 1 @@ -72,7 +72,7 @@ RenderObjectBump 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 RenderTerrainLODFactor 1 1 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 2.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -88,7 +88,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0.5 RenderAvatarVP 1 1 -RenderFarClip 1 96 +RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 8 RenderLightingDetail 1 1 @@ -97,7 +97,7 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 1.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 4.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -113,7 +113,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 128 +RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -122,9 +122,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 8.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 1.125 +RenderVolumeLODFactor 1 2.0 RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 @@ -138,7 +138,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 256 +RenderFarClip 1 1024 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -147,9 +147,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 3 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 +RenderTreeLODFactor 1 12.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 2.0 +RenderVolumeLODFactor 1 4.0 RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt index 15974c06..dec533ba 100644 --- a/linden/indra/newview/featuretable_mac.txt +++ b/linden/indra/newview/featuretable_mac.txt @@ -23,39 +23,37 @@ version 20 // NOTE: All settings are set to the MIN of applied values, including 'all'! // list all -RenderAnisotropic 1 0 -RenderAvatarCloth 0 0 -RenderAvatarLODFactor 1 1.0 -RenderAvatarVP 1 0 -RenderCubeMap 1 1 -RenderFarClip 1 256 -RenderFlexTimeFactor 1 1.0 -RenderFogRatio 1 4.0 -RenderGamma 1 0 -RenderGlowResolutionPow 1 9 -RenderGround 1 1 -RenderLightingDetail 1 1 -RenderMaxPartCount 1 8192 -RenderNightBrightness 1 1.0 -RenderObjectBump 1 1 -RenderReflectionDetail 1 3 -RenderTerrainDetail 1 1 -RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 -RenderUseImpostors 1 1 -RenderVBOEnable 1 1 -RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 -UseOcclusion 1 1 -VertexShaderEnable 1 1 -WindLightUseAtmosShaders 1 1 -WLSkyDetail 1 128 -RenderUseCleverUI 1 1 -Disregard128DefaultDrawDistance 1 1 -Disregard96DefaultDrawDistance 1 1 -RenderTextureMemoryMultiple 1 0.5 +RenderAnisotropic 1 0 +RenderAvatarCloth 1 1 +RenderAvatarLODFactor 1 1.0 +RenderAvatarVP 1 1 +RenderCubeMap 1 1 +RenderFarClip 1 1024 +RenderFlexTimeFactor 1 1.0 +RenderFogRatio 1 4.0 +RenderGamma 1 0 +RenderGlowResolutionPow 1 9 +RenderGround 1 1 +RenderLightingDetail 1 1 +RenderMaxPartCount 1 8192 +RenderNightBrightness 1 1.0 +RenderObjectBump 1 1 +RenderReflectionDetail 1 3 +RenderTerrainDetail 1 1 +RenderTerrainLODFactor 1 2.0 +RenderTreeLODFactor 1 12.0 +RenderUseImpostors 1 1 +RenderVBOEnable 1 1 +RenderVolumeLODFactor 1 4.0 +RenderWaterReflections 1 1 +UseStartScreen 1 1 +UseOcclusion 1 1 +VertexShaderEnable 1 1 +WindLightUseAtmosShaders 1 1 +WLSkyDetail 1 128 Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 +RenderTextureMemoryMultiple 1 1.0 // // Low Graphics Settings @@ -74,7 +72,7 @@ RenderObjectBump 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 RenderTerrainLODFactor 1 1 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 2.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -90,7 +88,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0.5 RenderAvatarVP 1 1 -RenderFarClip 1 96 +RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 8 RenderLightingDetail 1 1 @@ -99,7 +97,7 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 1.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 4.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 RenderWaterReflections 1 0 @@ -115,7 +113,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 128 +RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -124,9 +122,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 0.5 +RenderTreeLODFactor 1 8.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 1.125 +RenderVolumeLODFactor 1 2.0 RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 @@ -140,7 +138,7 @@ RenderAnisotropic 1 1 RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 -RenderFarClip 1 256 +RenderFarClip 1 1024 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 RenderLightingDetail 1 1 @@ -149,9 +147,9 @@ RenderObjectBump 1 1 RenderReflectionDetail 1 3 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTreeLODFactor 1 1.0 +RenderTreeLODFactor 1 12.0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 2.0 +RenderVolumeLODFactor 1 4.0 RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1