diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 0cd9543a81..0f33d40ac3 100755
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -47,13 +47,13 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
 RenderVBOMappingDisable		1	1
-RenderVolumeLODFactor		1	3.0
+RenderVolumeLODFactor		1	2.0
 UseStartScreen				1	1
 UseOcclusion				1	1
 VertexShaderEnable			1	1
@@ -90,17 +90,18 @@ RenderObjectBump			1	0
 RenderLocalLights			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // Mid Graphics Settings
@@ -119,17 +120,18 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -148,11 +150,11 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	3.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
@@ -177,11 +179,11 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	3.0
+RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index e430e62098..8142311a55 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -35,7 +35,7 @@ RenderAvatarMaxVisible      1   12
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
 RenderDelayVBUpdate			1	0
-RenderFarClip				1	192
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
 RenderGamma					1	0
@@ -47,13 +47,13 @@ RenderNightBrightness		1	1.0
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
-RenderVolumeLODFactor		1	3.0
 RenderVBOMappingDisable		1	1
+RenderVolumeLODFactor		1	2.0
 UseStartScreen				1	1
 UseOcclusion				1	1
 VertexShaderEnable			1	1
@@ -62,11 +62,11 @@ WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
-RenderShaderLightingMaxLevel	1	3
+RenderShaderLightingMaxLevel		1	3
 RenderDeferred				1	1
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
-RenderFSAASamples			1	0
+RenderDeferredSSAO			1	1
+RenderShadowDetail			1	2
+RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
 
 //
@@ -82,16 +82,16 @@ RenderAvatarVP				1	0
 RenderFarClip				1	64
 RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderMaxPartCount			1	250	
 RenderLocalLights			1	0
+RenderMaxPartCount			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
@@ -117,11 +117,11 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
@@ -147,11 +147,11 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	3.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
@@ -169,7 +169,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	192
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLocalLights			1	1
@@ -181,7 +181,7 @@ RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	3.0
+RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index db1a788613..942c043081 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -30,12 +30,12 @@ list all
 RenderAnisotropic				1	0
 RenderAvatarCloth				1	1
 RenderAvatarLODFactor			1	1.0
-RenderAvatarPhysicsLODFactor	1	1.0
+RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarMaxVisible          1   12
 RenderAvatarVP					1	1
 RenderCubeMap					1	1
 RenderDelayVBUpdate				1	0
-RenderFarClip					1	192
+RenderFarClip					1	256
 RenderFlexTimeFactor			1	1.0
 RenderFogRatio					1	4.0
 RenderGamma						1	0
@@ -47,7 +47,7 @@ RenderNightBrightness			1	1.0
 RenderObjectBump				1	1
 RenderReflectionDetail			1	4
 RenderTerrainDetail				1	1
-RenderTerrainLODFactor			1	4.0
+RenderTerrainLODFactor			1	2.0
 RenderTransparentWater			1	1
 RenderTreeLODFactor				1	1.0
 RenderUseImpostors				1	1
@@ -84,19 +84,16 @@ RenderAvatarVP				1	0
 RenderFarClip				1	64
 RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderLightingDetail		1	0
-RenderMaxPartCount			1	250
 RenderLocalLights			1	0
+RenderMaxPartCount			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
-RenderTextureMemoryMultiple	1	0.5
-RenderWaterReflections		1	0
+RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
@@ -104,6 +101,7 @@ RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
 RenderFSAASamples			1	0
+
 //
 // Mid Graphics Settings
 //
@@ -121,19 +119,18 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderTextureMemoryMultiple	1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
-RenderWaterReflections		1	0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -152,12 +149,11 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	3.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
-RenderWaterReflections		1	0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
@@ -175,7 +171,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	192
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLocalLights			1	1
@@ -183,12 +179,11 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	3.0
-RenderWaterReflections		1	1
+RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
@@ -390,9 +385,6 @@ RenderTextureMemoryMultiple			1	0.375
 RenderUseImpostors				0	0
 UseOcclusion				0	0
 
-list NVIDIA_GeForce_9600M
-RenderTextureMemoryMultiple		1	1.0
-
 /// tweaked ATI to 96 Draw distance
 
 list ATI_Radeon_9000
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index 7a490c0818..278d601860 100644
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -35,7 +35,7 @@ RenderAvatarMaxVisible      1   12
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
 RenderDelayVBUpdate			1	0
-RenderFarClip				1	192
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
 RenderGamma					1	0
@@ -47,13 +47,13 @@ RenderNightBrightness		1	1.0
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
-RenderVolumeLODFactor		1	3.0
 RenderVBOMappingDisable		1	1
+RenderVolumeLODFactor		1	2.0
 UseStartScreen				1	1
 UseOcclusion				1	1
 VertexShaderEnable			1	1
@@ -84,22 +84,23 @@ RenderAvatarVP				1	0
 RenderFarClip				1	64
 RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderMaxPartCount			1	250
 RenderLocalLights			1	0
+RenderMaxPartCount			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // Mid Graphics Settings
@@ -118,17 +119,18 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -147,11 +149,11 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	3.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
@@ -169,7 +171,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	192
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLocalLights			1	1
@@ -177,11 +179,11 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	4.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	3.0
+RenderVolumeLODFactor		1	2.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 0046abef6a..198e702459 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -175,11 +175,6 @@ ATI Radeon HD 6600				.*ATI.*Radeon HD *66..						3		1
 ATI Radeon HD 6700				.*ATI.*Radeon HD *67..						3		1
 ATI Radeon HD 6800				.*ATI.*Radeon HD *68..						3		1
 ATI Radeon HD 6900				.*ATI.*Radeon HD *69..						3		1
-ATI Radeon HD 7500				.*ATI.*Radeon HD *75..						3		1
-ATI Radeon HD 7600				.*ATI.*Radeon HD *76..						3		1
-ATI Radeon HD 7700				.*ATI.*Radeon HD *77..						3		1
-ATI Radeon HD 7800				.*ATI.*Radeon HD *78..						3		1
-ATI Radeon HD 7900				.*ATI.*Radeon HD *79..						3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.*						0		0
 ATI Radeon 2100					.*ATI.*Radeon 21..							0		1
 ATI Radeon 3000					.*ATI.*Radeon 30..							0		1
@@ -300,7 +295,6 @@ NVIDIA 310						.*NVIDIA .*GeForce 310.*					3		1
 NVIDIA 315M						.*NVIDIA .*GeForce 315M.*					2		1
 NVIDIA 315						.*NVIDIA .*GeForce 315.*					3		1
 NVIDIA 320M						.*NVIDIA .*GeForce 320M.*					2		1
-NVIDIA 610M						.*NVIDIA .*GeForce 610M.*					2		1
 NVIDIA G100M					.*NVIDIA .*100M.*							0		1
 NVIDIA G100						.*NVIDIA .*100.*							0		1
 NVIDIA G102M					.*NVIDIA .*102M.*							0		1
@@ -346,7 +340,6 @@ NVIDIA GT 530M					.*NVIDIA .*GT *530(M)?.*					3		1
 NVIDIA GT 540M					.*NVIDIA .*GT *54.(M)?.*					3		1
 NVIDIA GT 550M					.*NVIDIA .*GT *550(M)?.*					3		1
 NVIDIA GT 555M					.*NVIDIA .*GT *555(M)?.*					3		1
-NVIDIA GT 630M					.*NVIDIA .*GT *630(M)?.*					3		1
 NVIDIA GTS 160M					.*NVIDIA .*GT(S)? *160(M)?.*				2		1
 NVIDIA GTS 240					.*NVIDIA .*GTS *24.*						3		1
 NVIDIA GTS 250					.*NVIDIA .*GTS *25.*						3		1
@@ -539,5 +532,4 @@ XGI								XGI.*										0		0
 VIA								VIA.*										0		0
 Apple Generic					Apple.*Generic.*							0		0
 Apple Software Renderer			Apple.*Software Renderer.*					0		0
-Oracle VirtualBox Graphics		Humper.*									0		1
 Humper							Humper.*									0		1