diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 63f7f9c015..2b549e090e 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -43,13 +43,13 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
 RenderVBOMappingDisable		1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	3.0
 UseStartScreen				1	1
 UseOcclusion				1	1
 VertexShaderEnable			1	1
@@ -62,9 +62,8 @@ RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-WatchdogDisabled				1	1
+WatchdogDisabled			1	1
 RenderUseStreamVBO			1	1
-RenderFSAASamples			1	16
 
 //
 // Low Graphics Settings
@@ -84,7 +83,7 @@ RenderObjectBump			1	0
 RenderLocalLights			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
@@ -95,7 +94,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	0
 
 //
 // Mid Graphics Settings
@@ -114,7 +112,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -125,7 +123,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -144,7 +141,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	3.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -155,7 +152,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	4
 
 //
 // Ultra graphics (REALLY PURTY!)
@@ -173,7 +169,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
@@ -184,7 +180,6 @@ WLSkyDetail					1	128
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	4
 
 
 //
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 127624ffd1..9aa0d8fa0c 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -43,7 +43,7 @@ RenderNightBrightness		1	1.0
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
@@ -58,11 +58,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	1
-RenderShadowDetail			1	2
-RenderFSAASamples			1	4
+RenderDeferredSSAO			1	0
+RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // Low Graphics Settings
@@ -82,7 +82,7 @@ RenderLocalLights			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
@@ -112,7 +112,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -142,7 +142,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	3.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -153,7 +153,7 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	4
+RenderFSAASamples			1	0
 
 //
 // Ultra graphics (REALLY PURTY!)
@@ -180,10 +180,10 @@ RenderVolumeLODFactor		1	3.0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
-RenderDeferred				1	1
-RenderDeferredSSAO			1	1
-RenderShadowDetail			1	2
-RenderFSAASamples			1	4
+RenderDeferred				1	0
+RenderDeferredSSAO			1	0
+RenderShadowDetail			1	0
+RenderFSAASamples			1	0
 
 //
 // Class Unknown Hardware (unknown)
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index f0f1ad9c8a..7ac48adafb 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -26,7 +26,7 @@ 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
@@ -43,15 +43,15 @@ RenderNightBrightness			1	1.0
 RenderObjectBump				1	1
 RenderReflectionDetail			1	4
 RenderTerrainDetail				1	1
-RenderTerrainLODFactor			1	2.0
+RenderTerrainLODFactor			1	4.0
 RenderTransparentWater			1	1
 RenderTreeLODFactor				1	1.0
 RenderUseImpostors				1	1
 RenderVBOEnable					1	0
 RenderVolumeLODFactor			1	3.0
 RenderWaterReflections			1	1
-RenderVBOMappingDisable		1	0
-UseStartScreen				1	1
+RenderVBOMappingDisable			1	0
+UseStartScreen					1	1
 UseOcclusion					1	1
 VertexShaderEnable				1	1
 WindLightUseAtmosShaders		1	1
@@ -61,16 +61,15 @@ Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
-SkyUseClassicClouds			1	1
+SkyUseClassicClouds				1	1
 RenderShaderLightingMaxLevel	1	3
-RenderDeferred				1	1
-RenderDeferredSSAO			1	1
-RenderShadowDetail			1	2
+RenderDeferred					1	1
+RenderDeferredSSAO				1	1
+RenderShadowDetail				1	2
 WatchdogDisabled				1	1
-RenderUseFBO				1	1
-RenderDeferred				1	0
-RenderUseStreamVBO			1	0
-RenderFSAASamples			1	16
+RenderUseFBO					1	1
+RenderDeferred					1	0
+RenderUseStreamVBO				1	0
 
 //
 // Low Graphics Settings
@@ -91,12 +90,12 @@ RenderLocalLights			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	2.0
-RenderTextureMemoryMultiple             1       0.5
+RenderTextureMemoryMultiple	1	0.5
 RenderWaterReflections		1	0
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
@@ -105,7 +104,6 @@ RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
 RenderFSAASamples			1	0
-
 //
 // Mid Graphics Settings
 //
@@ -123,10 +121,10 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderTextureMemoryMultiple             1       0.5
+RenderTextureMemoryMultiple	1	0.5
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	2.0
 RenderWaterReflections		1	0
@@ -136,7 +134,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -155,7 +152,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	3.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -167,7 +164,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	4
 
 //
 // Ultra graphics (REALLY PURTY!)
@@ -186,7 +182,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
@@ -198,7 +194,6 @@ WLSkyDetail					1	128
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	4
 
 //
 // Class Unknown Hardware (unknown)
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index 0d0d182c1a..c452802f35 100644
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -43,7 +43,7 @@ RenderNightBrightness		1	1.0
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
@@ -62,9 +62,8 @@ RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-WatchdogDisabled				1	1
+WatchdogDisabled			1	1
 RenderUseStreamVBO			1	1
-RenderFSAASamples			1	16
 
 //
 // Low Graphics Settings
@@ -84,7 +83,7 @@ RenderLocalLights			1	0
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
-RenderTerrainLODFactor		1	1
+RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
@@ -95,7 +94,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	0
 
 //
 // Mid Graphics Settings
@@ -114,7 +112,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	1.0
+RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -125,7 +123,6 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFSAASamples			1	0
 
 //
 // High Graphics Settings (purty)
@@ -144,7 +141,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	3.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
 RenderUseImpostors			1	1
@@ -154,8 +151,7 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
-RenderShadowDetail			1	2
-RenderFSAASamples			1	4
+RenderShadowDetail			1	0
 
 //
 // Ultra graphics (REALLY PURTY!)
@@ -174,7 +170,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
-RenderTerrainLODFactor		1	2.0
+RenderTerrainLODFactor		1	4.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
 RenderUseImpostors			1	1
@@ -184,8 +180,7 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	128
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
-RenderShadowDetail			1	2
-RenderFSAASamples			1	8
+RenderShadowDetail			1	0
 
 //
 // Class Unknown Hardware (unknown)