From 34f252f52e6060b2e5cfea11d87667770768b732 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 22 May 2011 22:27:27 -0500 Subject: [PATCH] Updated featuretables. Ultra now enables deferred except without shadows. Also cleaned up to work with renamed/removed settings. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/featuretable.txt | 82 ++++++++++++++---------- indra/newview/featuretable_linux.txt | 84 ++++++++++++++----------- indra/newview/featuretable_mac.txt | 82 ++++++++++++++---------- indra/newview/llpaneldisplay.cpp | 4 +- indra/newview/llpaneldisplay.h | 1 + 6 files changed, 149 insertions(+), 106 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7735306ff..44f05bd68 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10465,7 +10465,7 @@ Type S32 Value - 2 + 0 RenderReflectionRes diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index a587d10ac..e3a8ca0de 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -34,18 +34,16 @@ RenderFogRatio 1 4.0 RenderGamma 1 0 RenderGlowResolutionPow 1 9 RenderGround 1 1 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 -RenderNightBrightness 1 1.0 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 UseStartScreen 1 1 UseOcclusion 1 1 VertexShaderEnable 1 1 @@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderShaderLightingMaxLevel 1 3 RenderTextureMemoryMultiple 1 1.0 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 1 +RenderDeferred 1 1 +RenderDeferredGI 1 1 +RenderShadowDetail 1 2 +RenderAvatarPhysicsLODFactor 1 1.0 // // Low Graphics Settings @@ -70,7 +71,7 @@ RenderAvatarVP 1 0 RenderFarClip 1 64 RenderFlexTimeFactor 1 0.1 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 1024 RenderObjectBump 1 0 RenderReflectionDetail 1 0 @@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1 RenderTreeLODFactor 1 0.25 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 0.5 -RenderWaterReflections 1 0 VertexShaderEnable 1 0 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 0 0 -RenderDeferred 0 0 -RenderFastAlpha 0 0 +RenderUseFBO 0 0 +RenderFastAlpha 1 1 +RenderDeferred 0 0 +RenderDeferredGI 0 0 +RenderShadowDetail 0 0 +RenderAvatarPhysicsLODFactor 1 0.0 // // Mid Graphics Settings @@ -98,7 +101,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 96 RenderFlexTimeFactor 1 0.5 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 2048 RenderObjectBump 1 1 RenderReflectionDetail 1 0 @@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.5 // @@ -127,7 +132,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 4096 RenderObjectBump 1 1 RenderReflectionDetail 1 2 @@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.75 // @@ -156,22 +163,24 @@ RenderAvatarVP 1 1 RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 128 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 0 +RenderDeferred 1 1 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 1.0 // // Class Unknown Hardware (unknown) @@ -209,9 +218,10 @@ RenderVBOEnable 1 1 list NoPixelShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // // No Vertex Shaders available @@ -219,9 +229,10 @@ WindLightUseAtmosShaders 0 0 list NoVertexShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // "Default" setups for safe, low, medium, high // @@ -229,14 +240,16 @@ list safe RenderAnisotropic 1 0 RenderAvatarCloth 0 0 RenderAvatarVP 0 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderObjectBump 0 0 RenderMaxPartCount 1 1024 RenderTerrainDetail 1 0 RenderUseImpostors 0 0 RenderVBOEnable 1 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 WindLightUseAtmosShaders 0 0 +RenderUseFBO 1 0 +RenderDeferred 1 0 // // CPU based feature masks @@ -260,12 +273,13 @@ RenderVBOEnable 1 0 list Intel RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderUseImpostors 0 0 +RenderDeferred 1 0 list GeForce2 RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 2048 RenderTerrainDetail 1 0 RenderVBOEnable 1 1 diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index c8245ae93..e64bfa3e3 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -34,18 +34,16 @@ RenderFogRatio 1 4.0 RenderGamma 1 0 RenderGlowResolutionPow 1 9 RenderGround 1 1 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 -RenderNightBrightness 1 1.0 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 UseStartScreen 1 1 UseOcclusion 1 1 VertexShaderEnable 1 1 @@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderShaderLightingMaxLevel 1 3 RenderTextureMemoryMultiple 1 1.0 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 1 +RenderDeferred 1 1 +RenderDeferredGI 1 1 +RenderShadowDetail 1 2 +RenderAvatarPhysicsLODFactor 1 1.0 // // Low Graphics Settings @@ -70,7 +71,7 @@ RenderAvatarVP 1 0 RenderFarClip 1 64 RenderFlexTimeFactor 1 0.1 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 1024 RenderObjectBump 1 0 RenderReflectionDetail 1 0 @@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1 RenderTreeLODFactor 1 0.25 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 0.5 -RenderWaterReflections 1 0 VertexShaderEnable 1 0 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 0 0 -RenderDeferred 0 0 -RenderFastAlpha 0 0 +RenderUseFBO 0 0 +RenderFastAlpha 1 1 +RenderDeferred 0 0 +RenderDeferredGI 0 0 +RenderShadowDetail 0 0 +RenderAvatarPhysicsLODFactor 1 0.0 // // Mid Graphics Settings @@ -98,7 +101,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 96 RenderFlexTimeFactor 1 0.5 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 2048 RenderObjectBump 1 1 RenderReflectionDetail 1 0 @@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.5 // @@ -127,7 +132,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 4096 RenderObjectBump 1 1 RenderReflectionDetail 1 2 @@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.75 // @@ -156,22 +163,24 @@ RenderAvatarVP 1 1 RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 128 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 0 +RenderDeferred 1 1 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 1.0 // @@ -210,9 +219,10 @@ RenderVBOEnable 1 1 list NoPixelShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // // No Vertex Shaders available @@ -220,9 +230,10 @@ WindLightUseAtmosShaders 0 0 list NoVertexShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // "Default" setups for safe, low, medium, high // @@ -230,16 +241,16 @@ list safe RenderAnisotropic 1 0 RenderAvatarCloth 0 0 RenderAvatarVP 0 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderObjectBump 0 0 RenderMaxPartCount 1 1024 RenderTerrainDetail 1 0 RenderUseImpostors 0 0 RenderVBOEnable 1 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 WindLightUseAtmosShaders 0 0 -RenderUseFBO 1 0 -RenderDeferred 1 0 +RenderUseFBO 1 0 +RenderDeferred 1 0 // @@ -264,13 +275,14 @@ RenderVBOEnable 1 0 list Intel RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 // Avoid some Intel crashes on Linux RenderCubeMap 0 0 +RenderDeferred 1 0 list GeForce2 RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 2048 RenderTerrainDetail 1 0 RenderVBOEnable 1 1 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 86df881f9..16156fe42 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -34,18 +34,16 @@ RenderFogRatio 1 4.0 RenderGamma 1 0 RenderGlowResolutionPow 1 9 RenderGround 1 1 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 -RenderNightBrightness 1 1.0 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 UseStartScreen 1 1 UseOcclusion 1 1 VertexShaderEnable 1 1 @@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderShaderLightingMaxLevel 1 3 RenderTextureMemoryMultiple 1 1.0 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 1 +RenderDeferred 1 1 +RenderDeferredGI 1 1 +RenderShadowDetail 1 2 +RenderAvatarPhysicsLODFactor 1 1.0 // // Low Graphics Settings @@ -70,7 +71,7 @@ RenderAvatarVP 1 0 RenderFarClip 1 64 RenderFlexTimeFactor 1 0.1 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 1024 RenderObjectBump 1 0 RenderReflectionDetail 1 0 @@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1 RenderTreeLODFactor 1 0.25 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 0.5 -RenderWaterReflections 1 0 VertexShaderEnable 1 0 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 0 0 -RenderDeferred 0 0 -RenderFastAlpha 0 0 +RenderUseFBO 0 0 +RenderFastAlpha 1 1 +RenderDeferred 0 0 +RenderDeferredGI 0 0 +RenderShadowDetail 0 0 +RenderAvatarPhysicsLODFactor 1 0.0 // // Mid Graphics Settings @@ -98,7 +101,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 96 RenderFlexTimeFactor 1 0.5 RenderGlowResolutionPow 1 8 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 2048 RenderObjectBump 1 1 RenderReflectionDetail 1 0 @@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.5 // @@ -127,7 +132,7 @@ RenderAvatarVP 1 1 RenderFarClip 1 128 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 4096 RenderObjectBump 1 1 RenderReflectionDetail 1 2 @@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 -RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 48 -RenderUseFBO 1 0 -RenderDeferred 1 0 -RenderFastAlpha 1 0 +RenderUseFBO 1 0 +RenderFastAlpha 1 0 +RenderDeferred 1 0 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 0.75 // @@ -156,22 +163,24 @@ RenderAvatarVP 1 1 RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderGlowResolutionPow 1 9 -RenderLightingDetail 1 1 +RenderLocalLights 1 1 RenderMaxPartCount 1 8192 RenderObjectBump 1 1 -RenderReflectionDetail 1 3 +RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 2.0 -RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 128 -RenderUseFBO 1 1 -RenderDeferred 1 1 -RenderFastAlpha 1 1 +RenderUseFBO 1 1 +RenderFastAlpha 1 0 +RenderDeferred 1 1 +RenderDeferredGI 1 0 +RenderShadowDetail 1 0 +RenderAvatarPhysicsLODFactor 1 1.0 // // Class Unknown Hardware (unknown) @@ -209,9 +218,10 @@ RenderVBOEnable 1 1 list NoPixelShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // // No Vertex Shaders available @@ -219,9 +229,10 @@ WindLightUseAtmosShaders 0 0 list NoVertexShaders RenderAvatarVP 0 0 RenderAvatarCloth 0 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 VertexShaderEnable 0 0 WindLightUseAtmosShaders 0 0 +RenderDeferred 0 0 // "Default" setups for safe, low, medium, high // @@ -229,14 +240,16 @@ list safe RenderAnisotropic 1 0 RenderAvatarCloth 0 0 RenderAvatarVP 0 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderObjectBump 0 0 RenderMaxPartCount 1 1024 RenderTerrainDetail 1 0 RenderUseImpostors 0 0 RenderVBOEnable 1 0 -RenderWaterReflections 0 0 +RenderReflectionDetail 0 0 WindLightUseAtmosShaders 0 0 +RenderUseFBO 1 0 +RenderDeferred 1 0 // // CPU based feature masks @@ -260,11 +273,12 @@ RenderVBOEnable 1 0 list Intel RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 +RenderDeferred 1 0 list GeForce2 RenderAnisotropic 1 0 -RenderLightingDetail 1 0 +RenderLocalLights 1 0 RenderMaxPartCount 1 2048 RenderTerrainDetail 1 0 RenderVBOEnable 1 1 diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp index ae0620cb2..4a684a61a 100644 --- a/indra/newview/llpaneldisplay.cpp +++ b/indra/newview/llpaneldisplay.cpp @@ -342,6 +342,7 @@ BOOL LLPanelDisplay::postBuild() mTerrainText = getChild("TerrainDetailText"); mLightingText = getChild("LightingDetailText"); mMeshDetailText = getChild("MeshDetailText"); + mShadowDetailText = getChild("ShadowDetailText"); refresh(); @@ -585,7 +586,7 @@ void LLPanelDisplay::disableUnavailableSettings() } // disabled reflections - if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderWaterReflections")) + if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderReflectionDetail")) { mCtrlReflectionDetail->setEnabled(FALSE); mCtrlReflectionDetail->setValue(FALSE); @@ -720,6 +721,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden) mTerrainText->setVisible(!isHidden); mDrawDistanceMeterText1->setVisible(!isHidden); mDrawDistanceMeterText2->setVisible(!isHidden); + mShadowDetailText->setVisible(!isHidden); // hide one meter text if we're making things visible if(!isHidden) diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h index 69b05857d..a36311390 100644 --- a/indra/newview/llpaneldisplay.h +++ b/indra/newview/llpaneldisplay.h @@ -141,6 +141,7 @@ protected: LLTextBox *mTerrainFactorText; LLTextBox *mSkyFactorText; LLTextBox *mPostProcessText; + LLTextBox *mShadowDetailText; BOOL mFSAutoDetectAspect; F32 mAspectRatio;