diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index e3a8ca0de..9b91d32f8 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 20
+version 32
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -23,9 +23,11 @@ version 20
 // NOTE: All settings are set to the MIN of applied values, including 'all'!
 //
 list all
-RenderAnisotropic			1	0
+RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
+RenderAvatarMaxVisible      1   12
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
 RenderFarClip				1	256
@@ -34,12 +36,13 @@ RenderFogRatio				1	4.0
 RenderGamma					1	0
 RenderGlowResolutionPow		1	9
 RenderGround				1	1
-RenderLocalLights			1	1
 RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
+RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
@@ -51,14 +54,16 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
-RenderShaderLightingMaxLevel	1	3
 RenderTextureMemoryMultiple		1	1.0
-RenderUseFBO				1	1
-RenderFastAlpha				1	1
+RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
-RenderDeferredGI			1	1
+RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-RenderAvatarPhysicsLODFactor	1	1.0
+WatchdogDisabled				1	1
+ShyotlRenderUseStreamVBO			1	1
+RenderDeferredGI			1	0
+RenderFastAlpha				1	1
+RenderUseFBO				1	1
 
 //
 // Low Graphics Settings
@@ -66,29 +71,32 @@ RenderAvatarPhysicsLODFactor	1	1.0
 list Low
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
-RenderAvatarLODFactor		1	0.25
+RenderAvatarLODFactor		1	0
+RenderAvatarPhysicsLODFactor 1	0
+RenderAvatarMaxVisible      1   3
 RenderAvatarVP				1	0
 RenderFarClip				1	64
-RenderFlexTimeFactor		1	0.1
+RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderLocalLights			1	0
 RenderMaxPartCount			1	1024
 RenderObjectBump			1	0
+RenderLocalLights			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
+RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0.25
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				0	0
-RenderFastAlpha				1	1
-RenderDeferred				0	0
+RenderDeferred				1	0
+RenderDeferredSSAO			1	0
+RenderShadowDetail			1	0
 RenderDeferredGI			0	0
-RenderShadowDetail			0	0
-RenderAvatarPhysicsLODFactor	1	0.0
+RenderFastAlpha				1	1
+RenderUseFBO				1	0
 
 //
 // Mid Graphics Settings
@@ -97,28 +105,30 @@ list Mid
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
+RenderAvatarPhysicsLODFactor 	1	0.5
 RenderAvatarVP				1	1
 RenderFarClip				1	96
-RenderFlexTimeFactor		1	0.5
+RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
-RenderLocalLights			1	1
 RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
+RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.5
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 
 //
@@ -128,29 +138,30 @@ list High
 RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	.75
 RenderAvatarVP				1	1
 RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
-RenderLocalLights			1	1
 RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
+RenderLocalLights			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.75
-
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 //
 // Ultra graphics (REALLY PURTY!)
@@ -163,24 +174,25 @@ RenderAvatarVP				1	1
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
-RenderLocalLights			1	1
 RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
+RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
-RenderUseFBO				1	1
-RenderFastAlpha				1	0
 RenderDeferred				1	1
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	1.0
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	1
 
 //
 // Class Unknown Hardware (unknown)
@@ -222,6 +234,8 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 //
 // No Vertex Shaders available
@@ -233,6 +247,8 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 // "Default" setups for safe, low, medium, high
 //
@@ -240,16 +256,18 @@ list safe
 RenderAnisotropic			1	0
 RenderAvatarCloth			0	0
 RenderAvatarVP				0	0
-RenderLocalLights			1	0
 RenderObjectBump			0	0
+RenderLocalLights			1	0
 RenderMaxPartCount			1	1024
 RenderTerrainDetail 		1	0
 RenderUseImpostors			0	0
 RenderVBOEnable				1	0
 RenderReflectionDetail		0	0
 WindLightUseAtmosShaders	0	0
-RenderUseFBO				1	0
-RenderDeferred				1	0
+RenderUseFBO				0	0
+RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 //
 // CPU based feature masks
@@ -271,10 +289,12 @@ RenderObjectBump			0	0
 list OpenGLPre15
 RenderVBOEnable				1	0
 
+list OpenGLPre30
+RenderDeferred				0	0
 list Intel
 RenderAnisotropic			1	0
+RenderVBOEnable				1	0
 RenderLocalLights			1	0
-RenderUseImpostors			0	0
 RenderDeferred				1	0
 
 list GeForce2
@@ -291,30 +311,37 @@ UseOcclusion				0	0
 list Intel_830M
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_845G					
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_855GM				
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_865G			
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_900		
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_915GM	
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_915G					
 RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
+RenderUseImpostors			0	0
 
 list Intel_945GM			
 RenderTerrainDetail			1	0
@@ -449,6 +476,14 @@ list ATIOldDriver
 RenderAvatarVP				0	0
 RenderAvatarCloth			0	0
 
+// ATI cards generally perform better when not using VBOs for streaming data
+
+list ATI
+ShyotlRenderUseStreamVBO			1	0
+
+// Disable vertex buffer objects by default for ATI cards with little video memory
+list ATIVramLT256
+RenderVBOEnable				1	0
 
 /// Tweaked NVIDIA
 
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index e64bfa3e3..97dda7be6 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 20
+version 27
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -26,6 +26,8 @@ list all
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
+RenderAvatarMaxVisible      1   12
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
 RenderFarClip				1	256
@@ -40,6 +42,7 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
@@ -51,14 +54,14 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
-RenderShaderLightingMaxLevel	1	3
 RenderTextureMemoryMultiple		1	1.0
-RenderUseFBO				1	1
-RenderFastAlpha				1	1
+RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
-RenderDeferredGI			1	1
+RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-RenderAvatarPhysicsLODFactor	1	1.0
+RenderDeferredGI			1	0
+RenderFastAlpha				1	1
+RenderUseFBO				1	1
 
 //
 // Low Graphics Settings
@@ -66,10 +69,12 @@ RenderAvatarPhysicsLODFactor	1	1.0
 list Low
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
-RenderAvatarLODFactor		1	0.25
+RenderAvatarLODFactor		1	0
+RenderAvatarPhysicsLODFactor 1	0
+RenderAvatarMaxVisible      1   3
 RenderAvatarVP				1	0
 RenderFarClip				1	64
-RenderFlexTimeFactor		1	0.1
+RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
 RenderLocalLights			1	0
 RenderMaxPartCount			1	1024
@@ -77,18 +82,19 @@ RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
+RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0.25
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				0	0
+RenderDeferred				1	0
+RenderDeferredSSAO			1	0
+RenderShadowDetail			1	0
+RenderDeferredGI			1	0
 RenderFastAlpha				1	1
-RenderDeferred				0	0
-RenderDeferredGI			0	0
-RenderShadowDetail			0	0
-RenderAvatarPhysicsLODFactor	1	0.0
+RenderUseFBO				1	0
 
 //
 // Mid Graphics Settings
@@ -97,9 +103,10 @@ list Mid
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
+RenderAvatarPhysicsLODFactor 1	0.5
 RenderAvatarVP				1	1
 RenderFarClip				1	96
-RenderFlexTimeFactor		1	0.5
+RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderLocalLights			1	1
 RenderMaxPartCount			1	2048
@@ -107,19 +114,19 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.5
-
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 //
 // High Graphics Settings (purty)
@@ -128,6 +135,7 @@ list High
 RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	0.75
 RenderAvatarVP				1	1
 RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
@@ -138,18 +146,19 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.75
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 
 //
@@ -159,6 +168,7 @@ list Ultra
 RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarVP				1	1
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
@@ -169,18 +179,20 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
-RenderUseFBO				1	1
-RenderFastAlpha				1	0
 RenderDeferred				1	1
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	1.0
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	1
+
 
 
 //
@@ -223,6 +235,8 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 //
 // No Vertex Shaders available
@@ -234,6 +248,8 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 // "Default" setups for safe, low, medium, high
 //
@@ -249,9 +265,13 @@ RenderUseImpostors			0	0
 RenderVBOEnable				1	0
 RenderReflectionDetail		0	0
 WindLightUseAtmosShaders	0	0
-RenderUseFBO				1	0
-RenderDeferred				1	0
-
+RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
+RenderShadowDetail			0	0
+RenderDeferredGI			0	0
+RenderFastAlpha				0	0
+RenderUseFBO				0	0
 
 //
 // CPU based feature masks
@@ -494,17 +514,47 @@ list NVIDIA_GeForce_Go_6
 RenderVBOEnable				1	0
 Disregard128DefaultDrawDistance	1	0
 
+list NVIDIA_GeForce_7000
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7100
+RenderShaderLightingMaxLevel	1	2
 list NVIDIA_GeForce_7200
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
 list NVIDIA_GeForce_7300
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
 list NVIDIA_GeForce_7400
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7500
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7600
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7700
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7800
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_7900
+RenderShaderLightingMaxLevel	1	2
 
 list NVIDIA_GeForce_Go_7200
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
 list NVIDIA_GeForce_Go_7300
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_Go_7300_LE
+RenderShaderLightingMaxLevel	1	2
 list NVIDIA_GeForce_Go_7400
 Disregard128DefaultDrawDistance	1	0
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_Go_7600
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_Go_7700
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_Go_7800
+RenderShaderLightingMaxLevel	1	2
+list NVIDIA_GeForce_Go_7900
+RenderShaderLightingMaxLevel	1	2
 
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 16156fe42..61afc26ab 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 20
+version 30
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -25,8 +25,10 @@ version 20
 list all
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	1
-RenderAvatarLODFactor		1	1.0
-RenderAvatarVP				1	1
+RenderAvatarLODFactor			1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
+RenderAvatarMaxVisible          1   12
+RenderAvatarVP					1	1
 RenderCubeMap				1	1
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
@@ -39,10 +41,11 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor			1	2.0
+RenderTransparentWater			1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
-RenderVBOEnable				1	1
+RenderVBOEnable					1	0
 RenderVolumeLODFactor		1	2.0
 UseStartScreen				1	1
 UseOcclusion				1	1
@@ -51,14 +54,19 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
+RenderTextureMemoryMultiple		1	0.5
 RenderShaderLightingMaxLevel	1	3
-RenderTextureMemoryMultiple		1	1.0
-RenderUseFBO				1	1
-RenderFastAlpha				1	1
+
+
 RenderDeferred				1	1
-RenderDeferredGI			1	1
+
 RenderShadowDetail			1	2
-RenderAvatarPhysicsLODFactor	1	1.0
+WatchdogDisabled				1	1
+ShyotlRenderUseStreamVBO			1	0
+RenderDeferredGI			1	1
+RenderFastAlpha				1	1
+RenderUseFBO				1	1
+
 
 //
 // Low Graphics Settings
@@ -66,10 +74,12 @@ RenderAvatarPhysicsLODFactor	1	1.0
 list Low
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
-RenderAvatarLODFactor		1	0.25
+RenderAvatarLODFactor		1	0
+RenderAvatarPhysicsLODFactor 1	0
+RenderAvatarMaxVisible      1   3
 RenderAvatarVP				1	0
 RenderFarClip				1	64
-RenderFlexTimeFactor		1	0.1
+RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
 RenderLocalLights			1	0
 RenderMaxPartCount			1	1024
@@ -77,18 +87,19 @@ RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
+RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0.25
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				0	0
+RenderDeferred				1	0
+RenderDeferredSSAO			1	0
+RenderShadowDetail			1	0
+RenderDeferredGI			1	0
+RenderUseFBO				1	0
 RenderFastAlpha				1	1
-RenderDeferred				0	0
-RenderDeferredGI			0	0
-RenderShadowDetail			0	0
-RenderAvatarPhysicsLODFactor	1	0.0
 
 //
 // Mid Graphics Settings
@@ -97,6 +108,7 @@ list Mid
 RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
+RenderAvatarPhysicsLODFactor 1	0.5
 RenderAvatarVP				1	1
 RenderFarClip				1	96
 RenderFlexTimeFactor		1	0.5
@@ -107,18 +119,19 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.5
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 
 //
@@ -128,6 +141,7 @@ list High
 RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor	1	0.75
 RenderAvatarVP				1	1
 RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
@@ -138,18 +152,19 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderUseFBO				1	0
-RenderFastAlpha				1	0
 RenderDeferred				1	0
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	0.75
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	0
 
 
 //
@@ -159,6 +174,7 @@ list Ultra
 RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarVP				1	1
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
@@ -169,18 +185,19 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
+RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
-RenderUseFBO				1	1
-RenderFastAlpha				1	0
 RenderDeferred				1	1
-RenderDeferredGI			1	0
+RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderAvatarPhysicsLODFactor	1	1.0
+RenderDeferredGI			1	0
+RenderFastAlpha				1	0
+RenderUseFBO				1	1
 
 //
 // Class Unknown Hardware (unknown)
@@ -222,6 +239,8 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
 //
 // No Vertex Shaders available
@@ -233,7 +252,10 @@ RenderReflectionDetail		0	0
 VertexShaderEnable			0	0
 WindLightUseAtmosShaders	0	0
 RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
 
+//
 // "Default" setups for safe, low, medium, high
 //
 list safe
@@ -248,8 +270,10 @@ RenderUseImpostors			0	0
 RenderVBOEnable				1	0
 RenderReflectionDetail		0	0
 WindLightUseAtmosShaders	0	0
-RenderUseFBO				1	0
-RenderDeferred				1	0
+RenderDeferred				0	0
+RenderDeferredSSAO			0	0
+RenderShadowDetail			0	0
+RenderUseFBO				0	0
 
 //
 // CPU based feature masks
@@ -271,10 +295,15 @@ RenderObjectBump			0	0
 list OpenGLPre15
 RenderVBOEnable				1	0
 
+list TexUnit8orLess
+RenderDeferredSSAO			0	0
+
+list ATI
+RenderDeferredSSAO			1	0
+
 list Intel
 RenderAnisotropic			1	0
 RenderLocalLights			1	0
-RenderDeferred				1	0
 
 list GeForce2
 RenderAnisotropic			1	0
@@ -407,23 +436,23 @@ Disregard128DefaultDrawDistance	1	0
 // invisible avatars on HD 2600... so I masked
 // out other possible bad ones till it's fixed
 
-list ATI_Radeon_HD_2300
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-Disregard128DefaultDrawDistance	1	0
-list ATI_Radeon_HD_2400
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-Disregard128DefaultDrawDistance	1	0
-list ATI_Radeon_HD_2600
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_2900
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_3800
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
+//list ATI_Radeon_HD_2300
+//RenderAvatarVP				0	0
+//RenderAvatarCloth			0	0
+//Disregard128DefaultDrawDistance	1	0
+//list ATI_Radeon_HD_2400
+//RenderAvatarVP				0	0
+//RenderAvatarCloth			0	0
+//Disregard128DefaultDrawDistance	1	0
+//list ATI_Radeon_HD_2600
+//RenderAvatarVP				0	0
+//RenderAvatarCloth			0	0
+//list ATI_Radeon_HD_2900
+//RenderAvatarVP				0	0
+//RenderAvatarCloth			0	0
+//list ATI_Radeon_HD_3800
+//RenderAvatarVP				0	0
+//RenderAvatarCloth			0	0
 
 /// Tweaked NVIDIA
 
diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt
index f24cbde5e..7df75687f 100644
--- a/indra/newview/featuretable_solaris.txt
+++ b/indra/newview/featuretable_solaris.txt
@@ -37,6 +37,9 @@ VertexShaderEnable	1	1
 RenderTextureMemoryMultiple		1	1.0
 UseOcclusion		1       1
 RenderCubeMap		1       1
+WatchdogDisabled				1	1
+RenderUseFBO				1	1
+
 
 //
 // Class 0 Hardware (Unknown or just old)
@@ -50,6 +53,7 @@ RenderAvatarMode	1	0
 RenderLighting		1	0
 RenderObjectBump	1	0
 RenderRippleWater	1	0
+RenderUseFBO		1	0
 
 //
 // Class 1 Hardware
@@ -63,6 +67,7 @@ RenderAvatarMode	1	0
 RenderLighting		1	0
 RenderObjectBump	1	0
 RenderRippleWater	1	0
+RenderUseFBO		1	0
 
 //
 // Class 2 Hardware (make it purty)
@@ -74,6 +79,7 @@ RenderAvatarMode	1	1
 RenderLighting		1	1
 RenderObjectBump	1	1
 RenderRippleWater	1	1
+RenderUseFBO		1	1
 
 //
 // Class 3 Hardware (make it purty)
@@ -85,6 +91,7 @@ RenderAvatarMode	1	1
 RenderLighting		1	1
 RenderObjectBump	1	1
 RenderRippleWater	1	1
+RenderUseFBO		1	1
 
 //
 // No Pixel Shaders available
@@ -112,11 +119,13 @@ RenderParticleCount	1	1024
 RenderTerrainDetail 1	0
 RenderCubeMap		0	0
 UseOcclusion		0	0
+RenderUseFBO		1	0
 
 
 list low
 RenderVBO			1	0
 RenderAniso			1	0
+RenderAvatarMaxVisible      1   3
 RenderLighting		1	0
 
 list medium