aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Seikel2011-06-09 23:40:21 +1000
committerDavid Walter Seikel2013-05-13 21:12:38 +1000
commit66f5181a17fbe49a42bf864679f3af08a85bcb08 (patch)
treeaea520e4b35fb26883bf641bfd2afe82680eeb5f /linden
parentAdd new communication channel urls to the viewer's Help menu - http://redmine... (diff)
downloadmeta-impy-66f5181a17fbe49a42bf864679f3af08a85bcb08.zip
meta-impy-66f5181a17fbe49a42bf864679f3af08a85bcb08.tar.gz
meta-impy-66f5181a17fbe49a42bf864679f3af08a85bcb08.tar.bz2
meta-impy-66f5181a17fbe49a42bf864679f3af08a85bcb08.tar.xz
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.
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/CMakeLists.txt8
-rw-r--r--linden/indra/newview/app_settings/high_graphics.xml39
-rw-r--r--linden/indra/newview/app_settings/low_graphics.xml39
-rw-r--r--linden/indra/newview/app_settings/mid_graphics.xml39
-rw-r--r--linden/indra/newview/app_settings/ultra_graphics.xml39
-rw-r--r--linden/indra/newview/featuretable.txt26
-rw-r--r--linden/indra/newview/featuretable_linux.txt24
-rw-r--r--linden/indra/newview/featuretable_mac.txt78
8 files changed, 66 insertions, 226 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 907fa5c..540754d 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1204,19 +1204,19 @@ set(viewer_APPSETTINGS_FILES
1204 app_settings/cmd_line.xml 1204 app_settings/cmd_line.xml
1205 app_settings/default_grids.xml 1205 app_settings/default_grids.xml
1206 app_settings/grass.xml 1206 app_settings/grass.xml
1207 app_settings/high_graphics.xml 1207# app_settings/high_graphics.xml
1208 app_settings/keys.ini 1208 app_settings/keys.ini
1209 app_settings/keywords.ini 1209 app_settings/keywords.ini
1210 app_settings/logcontrol.xml 1210 app_settings/logcontrol.xml
1211 app_settings/low_graphics.xml 1211# app_settings/low_graphics.xml
1212 app_settings/mid_graphics.xml 1212# app_settings/mid_graphics.xml
1213 app_settings/settings.xml 1213 app_settings/settings.xml
1214 app_settings/settings_crash_behavior.xml 1214 app_settings/settings_crash_behavior.xml
1215 app_settings/settings_files.xml 1215 app_settings/settings_files.xml
1216 app_settings/settings_per_account.xml 1216 app_settings/settings_per_account.xml
1217 app_settings/std_bump.ini 1217 app_settings/std_bump.ini
1218 app_settings/trees.xml 1218 app_settings/trees.xml
1219 app_settings/ultra_graphics.xml 1219# app_settings/ultra_graphics.xml
1220 app_settings/viewerart.xml 1220 app_settings/viewerart.xml
1221 ${CMAKE_SOURCE_DIR}/../etc/message.xml 1221 ${CMAKE_SOURCE_DIR}/../etc/message.xml
1222 ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg 1222 ${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 6368f70..0000000
--- a/linden/indra/newview/app_settings/high_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101">
3 <!--NO SHADERS-->
4 <RenderAvatarCloth value="FALSE"/>
5 <!--Default for now-->
6 <RenderAvatarLODFactor value="1.0"/>
7 <!--NO SHADERS-->
8 <RenderAvatarVP value="TRUE"/>
9 <!--Short Range-->
10 <RenderFarClip value="128"/>
11 <!--Default for now-->
12 <RenderFlexTimeFactor value="1"/>
13 <!--256... but they don't use this-->
14 <RenderGlowResolutionPow value="9"/>
15 <!--Sun/Moon only-->
16 <RenderLightingDetail value="1"/>
17 <!--Low number-->
18 <RenderMaxPartCount value="4096"/>
19 <!--bump okay-->
20 <RenderObjectBump value="TRUE"/>
21 <!--NO SHADERS-->
22 <RenderReflectionDetail value="2"/>
23 <!--Simple-->
24 <RenderTerrainDetail value="1"/>
25 <!--Default for now-->
26 <RenderTerrainLODFactor value="2"/>
27 <!--Default for now-->
28 <RenderTreeLODFactor value="0.5"/>
29 <!--Try Impostors-->
30 <RenderUseImpostors value="TRUE"/>
31 <!--Default for now-->
32 <RenderVolumeLODFactor value="1.125"/>
33 <!--NO SHADERS-->
34 <RenderWaterReflections value="FALSE"/>
35 <!--NO SHADERS-->
36 <VertexShaderEnable value="TRUE"/>
37 <!--NO SHADERS-->
38 <WindLightUseAtmosShaders value="TRUE"/>
39</settings>
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 3f67a70..0000000
--- a/linden/indra/newview/app_settings/low_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101">
3 <!--NO SHADERS-->
4 <RenderAvatarCloth value="FALSE"/>
5 <!--Default for now-->
6 <RenderAvatarLODFactor value="0.5"/>
7 <!--NO SHADERS-->
8 <RenderAvatarVP value="FALSE"/>
9 <!--Short Range-->
10 <RenderFarClip value="64"/>
11 <!--Default for now-->
12 <RenderFlexTimeFactor value="0.5"/>
13 <!--256... but they don't use this-->
14 <RenderGlowResolutionPow value="8"/>
15 <!--Sun/Moon only-->
16 <RenderLightingDetail value="0"/>
17 <!--Low number-->
18 <RenderMaxPartCount value="1024"/>
19 <!--bump okay-->
20 <RenderObjectBump value="FALSE"/>
21 <!--NO SHADERS-->
22 <RenderReflectionDetail value="0"/>
23 <!--Simple-->
24 <RenderTerrainDetail value="0"/>
25 <!--Default for now-->
26 <RenderTerrainLODFactor value="1.0"/>
27 <!--Default for now-->
28 <RenderTreeLODFactor value="0.5"/>
29 <!--Try Impostors-->
30 <RenderUseImpostors value="TRUE"/>
31 <!--Default for now-->
32 <RenderVolumeLODFactor value="1.125"/>
33 <!--NO SHADERS-->
34 <RenderWaterReflections value="FALSE"/>
35 <!--NO SHADERS-->
36 <VertexShaderEnable value="FALSE"/>
37 <!--NO SHADERS-->
38 <WindLightUseAtmosShaders value="FALSE"/>
39</settings>
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 12da77d..0000000
--- a/linden/indra/newview/app_settings/mid_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101">
3 <!--NO SHADERS-->
4 <RenderAvatarCloth value="FALSE"/>
5 <!--Default for now-->
6 <RenderAvatarLODFactor value="0.5"/>
7 <!--NO SHADERS-->
8 <RenderAvatarVP value="TRUE"/>
9 <!--Short Range-->
10 <RenderFarClip value="96"/>
11 <!--Default for now-->
12 <RenderFlexTimeFactor value="1"/>
13 <!--256... but they don't use this-->
14 <RenderGlowResolutionPow value="8"/>
15 <!--Sun/Moon only-->
16 <RenderLightingDetail value="1"/>
17 <!--Low number-->
18 <RenderMaxPartCount value="2048"/>
19 <!--bump okay-->
20 <RenderObjectBump value="TRUE"/>
21 <!--NO SHADERS-->
22 <RenderReflectionDetail value="0"/>
23 <!--Simple-->
24 <RenderTerrainDetail value="1"/>
25 <!--Default for now-->
26 <RenderTerrainLODFactor value="1.0"/>
27 <!--Default for now-->
28 <RenderTreeLODFactor value="0.5"/>
29 <!--Try Impostors-->
30 <RenderUseImpostors value="TRUE"/>
31 <!--Default for now-->
32 <RenderVolumeLODFactor value="1.125"/>
33 <!--NO SHADERS-->
34 <RenderWaterReflections value="FALSE"/>
35 <!--NO SHADERS-->
36 <VertexShaderEnable value="TRUE"/>
37 <!--NO SHADERS-->
38 <WindLightUseAtmosShaders value="FALSE"/>
39</settings>
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 f16ec6c..0000000
--- a/linden/indra/newview/app_settings/ultra_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101">
3 <!--NO SHADERS-->
4 <RenderAvatarCloth value="TRUE"/>
5 <!--Default for now-->
6 <RenderAvatarLODFactor value="1.0"/>
7 <!--NO SHADERS-->
8 <RenderAvatarVP value="TRUE"/>
9 <!--Short Range-->
10 <RenderFarClip value="256"/>
11 <!--Default for now-->
12 <RenderFlexTimeFactor value="1"/>
13 <!--256... but they don't use this-->
14 <RenderGlowResolutionPow value="9"/>
15 <!--Sun/Moon only-->
16 <RenderLightingDetail value="1"/>
17 <!--Low number-->
18 <RenderMaxPartCount value="4096"/>
19 <!--bump okay-->
20 <RenderObjectBump value="TRUE"/>
21 <!--NO SHADERS-->
22 <RenderReflectionDetail value="3"/>
23 <!--Simple-->
24 <RenderTerrainDetail value="1"/>
25 <!--Default for now-->
26 <RenderTerrainLODFactor value="2.0"/>
27 <!--Default for now-->
28 <RenderTreeLODFactor value="1.0"/>
29 <!--Try Impostors-->
30 <RenderUseImpostors value="TRUE"/>
31 <!--Default for now-->
32 <RenderVolumeLODFactor value="2.0"/>
33 <!--NO SHADERS-->
34 <RenderWaterReflections value="TRUE"/>
35 <!--NO SHADERS-->
36 <VertexShaderEnable value="TRUE"/>
37 <!--NO SHADERS-->
38 <WindLightUseAtmosShaders value="TRUE"/>
39</settings>
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index a31cd71..6da62f0 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -28,7 +28,7 @@ RenderAvatarCloth 1 1
28RenderAvatarLODFactor 1 1.0 28RenderAvatarLODFactor 1 1.0
29RenderAvatarVP 1 1 29RenderAvatarVP 1 1
30RenderCubeMap 1 1 30RenderCubeMap 1 1
31RenderFarClip 1 256 31RenderFarClip 1 1024
32RenderFlexTimeFactor 1 1.0 32RenderFlexTimeFactor 1 1.0
33RenderFogRatio 1 4.0 33RenderFogRatio 1 4.0
34RenderGamma 1 0 34RenderGamma 1 0
@@ -41,10 +41,10 @@ RenderObjectBump 1 1
41RenderReflectionDetail 1 3 41RenderReflectionDetail 1 3
42RenderTerrainDetail 1 1 42RenderTerrainDetail 1 1
43RenderTerrainLODFactor 1 2.0 43RenderTerrainLODFactor 1 2.0
44RenderTreeLODFactor 1 1.0 44RenderTreeLODFactor 1 12.0
45RenderUseImpostors 1 1 45RenderUseImpostors 1 1
46RenderVBOEnable 1 1 46RenderVBOEnable 1 1
47RenderVolumeLODFactor 1 2.0 47RenderVolumeLODFactor 1 4.0
48RenderWaterReflections 1 1 48RenderWaterReflections 1 1
49UseStartScreen 1 1 49UseStartScreen 1 1
50UseOcclusion 1 1 50UseOcclusion 1 1
@@ -54,8 +54,6 @@ WLSkyDetail 1 128
54Disregard128DefaultDrawDistance 1 1 54Disregard128DefaultDrawDistance 1 1
55Disregard96DefaultDrawDistance 1 1 55Disregard96DefaultDrawDistance 1 1
56RenderTextureMemoryMultiple 1 1.0 56RenderTextureMemoryMultiple 1 1.0
57RenderShaderLightingMaxLevel 1 3
58
59 57
60// 58//
61// Low Graphics Settings 59// Low Graphics Settings
@@ -74,7 +72,7 @@ RenderObjectBump 1 0
74RenderReflectionDetail 1 0 72RenderReflectionDetail 1 0
75RenderTerrainDetail 1 0 73RenderTerrainDetail 1 0
76RenderTerrainLODFactor 1 1 74RenderTerrainLODFactor 1 1
77RenderTreeLODFactor 1 0.5 75RenderTreeLODFactor 1 2.0
78RenderUseImpostors 1 1 76RenderUseImpostors 1 1
79RenderVolumeLODFactor 1 1.125 77RenderVolumeLODFactor 1 1.125
80RenderWaterReflections 1 0 78RenderWaterReflections 1 0
@@ -90,7 +88,7 @@ RenderAnisotropic 1 0
90RenderAvatarCloth 1 0 88RenderAvatarCloth 1 0
91RenderAvatarLODFactor 1 0.5 89RenderAvatarLODFactor 1 0.5
92RenderAvatarVP 1 1 90RenderAvatarVP 1 1
93RenderFarClip 1 96 91RenderFarClip 1 128
94RenderFlexTimeFactor 1 1.0 92RenderFlexTimeFactor 1 1.0
95RenderGlowResolutionPow 1 8 93RenderGlowResolutionPow 1 8
96RenderLightingDetail 1 1 94RenderLightingDetail 1 1
@@ -99,7 +97,7 @@ RenderObjectBump 1 1
99RenderReflectionDetail 1 0 97RenderReflectionDetail 1 0
100RenderTerrainDetail 1 1 98RenderTerrainDetail 1 1
101RenderTerrainLODFactor 1 1.0 99RenderTerrainLODFactor 1 1.0
102RenderTreeLODFactor 1 0.5 100RenderTreeLODFactor 1 4.0
103RenderUseImpostors 1 1 101RenderUseImpostors 1 1
104RenderVolumeLODFactor 1 1.125 102RenderVolumeLODFactor 1 1.125
105RenderWaterReflections 1 0 103RenderWaterReflections 1 0
@@ -115,7 +113,7 @@ RenderAnisotropic 1 1
115RenderAvatarCloth 1 0 113RenderAvatarCloth 1 0
116RenderAvatarLODFactor 1 1.0 114RenderAvatarLODFactor 1 1.0
117RenderAvatarVP 1 1 115RenderAvatarVP 1 1
118RenderFarClip 1 128 116RenderFarClip 1 256
119RenderFlexTimeFactor 1 1.0 117RenderFlexTimeFactor 1 1.0
120RenderGlowResolutionPow 1 9 118RenderGlowResolutionPow 1 9
121RenderLightingDetail 1 1 119RenderLightingDetail 1 1
@@ -124,9 +122,9 @@ RenderObjectBump 1 1
124RenderReflectionDetail 1 2 122RenderReflectionDetail 1 2
125RenderTerrainDetail 1 1 123RenderTerrainDetail 1 1
126RenderTerrainLODFactor 1 2.0 124RenderTerrainLODFactor 1 2.0
127RenderTreeLODFactor 1 0.5 125RenderTreeLODFactor 1 8.0
128RenderUseImpostors 1 1 126RenderUseImpostors 1 1
129RenderVolumeLODFactor 1 1.125 127RenderVolumeLODFactor 1 2.0
130RenderWaterReflections 1 0 128RenderWaterReflections 1 0
131VertexShaderEnable 1 1 129VertexShaderEnable 1 1
132WindLightUseAtmosShaders 1 1 130WindLightUseAtmosShaders 1 1
@@ -140,7 +138,7 @@ RenderAnisotropic 1 1
140RenderAvatarCloth 1 1 138RenderAvatarCloth 1 1
141RenderAvatarLODFactor 1 1.0 139RenderAvatarLODFactor 1 1.0
142RenderAvatarVP 1 1 140RenderAvatarVP 1 1
143RenderFarClip 1 256 141RenderFarClip 1 1024
144RenderFlexTimeFactor 1 1.0 142RenderFlexTimeFactor 1 1.0
145RenderGlowResolutionPow 1 9 143RenderGlowResolutionPow 1 9
146RenderLightingDetail 1 1 144RenderLightingDetail 1 1
@@ -149,9 +147,9 @@ RenderObjectBump 1 1
149RenderReflectionDetail 1 3 147RenderReflectionDetail 1 3
150RenderTerrainDetail 1 1 148RenderTerrainDetail 1 1
151RenderTerrainLODFactor 1 2.0 149RenderTerrainLODFactor 1 2.0
152RenderTreeLODFactor 1 1.0 150RenderTreeLODFactor 1 12.0
153RenderUseImpostors 1 1 151RenderUseImpostors 1 1
154RenderVolumeLODFactor 1 2.0 152RenderVolumeLODFactor 1 4.0
155RenderWaterReflections 1 1 153RenderWaterReflections 1 1
156VertexShaderEnable 1 1 154VertexShaderEnable 1 1
157WindLightUseAtmosShaders 1 1 155WindLightUseAtmosShaders 1 1
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index 57d712e..c5c685c 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -28,7 +28,7 @@ RenderAvatarCloth 1 1
28RenderAvatarLODFactor 1 1.0 28RenderAvatarLODFactor 1 1.0
29RenderAvatarVP 1 1 29RenderAvatarVP 1 1
30RenderCubeMap 1 1 30RenderCubeMap 1 1
31RenderFarClip 1 256 31RenderFarClip 1 1024
32RenderFlexTimeFactor 1 1.0 32RenderFlexTimeFactor 1 1.0
33RenderFogRatio 1 4.0 33RenderFogRatio 1 4.0
34RenderGamma 1 0 34RenderGamma 1 0
@@ -41,10 +41,10 @@ RenderObjectBump 1 1
41RenderReflectionDetail 1 3 41RenderReflectionDetail 1 3
42RenderTerrainDetail 1 1 42RenderTerrainDetail 1 1
43RenderTerrainLODFactor 1 2.0 43RenderTerrainLODFactor 1 2.0
44RenderTreeLODFactor 1 1.0 44RenderTreeLODFactor 1 12.0
45RenderUseImpostors 1 1 45RenderUseImpostors 1 1
46RenderVBOEnable 1 1 46RenderVBOEnable 1 1
47RenderVolumeLODFactor 1 2.0 47RenderVolumeLODFactor 1 4.0
48RenderWaterReflections 1 1 48RenderWaterReflections 1 1
49UseStartScreen 1 1 49UseStartScreen 1 1
50UseOcclusion 1 1 50UseOcclusion 1 1
@@ -72,7 +72,7 @@ RenderObjectBump 1 0
72RenderReflectionDetail 1 0 72RenderReflectionDetail 1 0
73RenderTerrainDetail 1 0 73RenderTerrainDetail 1 0
74RenderTerrainLODFactor 1 1 74RenderTerrainLODFactor 1 1
75RenderTreeLODFactor 1 0.5 75RenderTreeLODFactor 1 2.0
76RenderUseImpostors 1 1 76RenderUseImpostors 1 1
77RenderVolumeLODFactor 1 1.125 77RenderVolumeLODFactor 1 1.125
78RenderWaterReflections 1 0 78RenderWaterReflections 1 0
@@ -88,7 +88,7 @@ RenderAnisotropic 1 0
88RenderAvatarCloth 1 0 88RenderAvatarCloth 1 0
89RenderAvatarLODFactor 1 0.5 89RenderAvatarLODFactor 1 0.5
90RenderAvatarVP 1 1 90RenderAvatarVP 1 1
91RenderFarClip 1 96 91RenderFarClip 1 128
92RenderFlexTimeFactor 1 1.0 92RenderFlexTimeFactor 1 1.0
93RenderGlowResolutionPow 1 8 93RenderGlowResolutionPow 1 8
94RenderLightingDetail 1 1 94RenderLightingDetail 1 1
@@ -97,7 +97,7 @@ RenderObjectBump 1 1
97RenderReflectionDetail 1 0 97RenderReflectionDetail 1 0
98RenderTerrainDetail 1 1 98RenderTerrainDetail 1 1
99RenderTerrainLODFactor 1 1.0 99RenderTerrainLODFactor 1 1.0
100RenderTreeLODFactor 1 0.5 100RenderTreeLODFactor 1 4.0
101RenderUseImpostors 1 1 101RenderUseImpostors 1 1
102RenderVolumeLODFactor 1 1.125 102RenderVolumeLODFactor 1 1.125
103RenderWaterReflections 1 0 103RenderWaterReflections 1 0
@@ -113,7 +113,7 @@ RenderAnisotropic 1 1
113RenderAvatarCloth 1 0 113RenderAvatarCloth 1 0
114RenderAvatarLODFactor 1 1.0 114RenderAvatarLODFactor 1 1.0
115RenderAvatarVP 1 1 115RenderAvatarVP 1 1
116RenderFarClip 1 128 116RenderFarClip 1 256
117RenderFlexTimeFactor 1 1.0 117RenderFlexTimeFactor 1 1.0
118RenderGlowResolutionPow 1 9 118RenderGlowResolutionPow 1 9
119RenderLightingDetail 1 1 119RenderLightingDetail 1 1
@@ -122,9 +122,9 @@ RenderObjectBump 1 1
122RenderReflectionDetail 1 2 122RenderReflectionDetail 1 2
123RenderTerrainDetail 1 1 123RenderTerrainDetail 1 1
124RenderTerrainLODFactor 1 2.0 124RenderTerrainLODFactor 1 2.0
125RenderTreeLODFactor 1 0.5 125RenderTreeLODFactor 1 8.0
126RenderUseImpostors 1 1 126RenderUseImpostors 1 1
127RenderVolumeLODFactor 1 1.125 127RenderVolumeLODFactor 1 2.0
128RenderWaterReflections 1 0 128RenderWaterReflections 1 0
129VertexShaderEnable 1 1 129VertexShaderEnable 1 1
130WindLightUseAtmosShaders 1 1 130WindLightUseAtmosShaders 1 1
@@ -138,7 +138,7 @@ RenderAnisotropic 1 1
138RenderAvatarCloth 1 1 138RenderAvatarCloth 1 1
139RenderAvatarLODFactor 1 1.0 139RenderAvatarLODFactor 1 1.0
140RenderAvatarVP 1 1 140RenderAvatarVP 1 1
141RenderFarClip 1 256 141RenderFarClip 1 1024
142RenderFlexTimeFactor 1 1.0 142RenderFlexTimeFactor 1 1.0
143RenderGlowResolutionPow 1 9 143RenderGlowResolutionPow 1 9
144RenderLightingDetail 1 1 144RenderLightingDetail 1 1
@@ -147,9 +147,9 @@ RenderObjectBump 1 1
147RenderReflectionDetail 1 3 147RenderReflectionDetail 1 3
148RenderTerrainDetail 1 1 148RenderTerrainDetail 1 1
149RenderTerrainLODFactor 1 2.0 149RenderTerrainLODFactor 1 2.0
150RenderTreeLODFactor 1 1.0 150RenderTreeLODFactor 1 12.0
151RenderUseImpostors 1 1 151RenderUseImpostors 1 1
152RenderVolumeLODFactor 1 2.0 152RenderVolumeLODFactor 1 4.0
153RenderWaterReflections 1 1 153RenderWaterReflections 1 1
154VertexShaderEnable 1 1 154VertexShaderEnable 1 1
155WindLightUseAtmosShaders 1 1 155WindLightUseAtmosShaders 1 1
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index 15974c0..dec533b 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -23,39 +23,37 @@ version 20
23// NOTE: All settings are set to the MIN of applied values, including 'all'! 23// NOTE: All settings are set to the MIN of applied values, including 'all'!
24// 24//
25list all 25list all
26RenderAnisotropic 1 0 26RenderAnisotropic 1 0
27RenderAvatarCloth 0 0 27RenderAvatarCloth 1 1
28RenderAvatarLODFactor 1 1.0 28RenderAvatarLODFactor 1 1.0
29RenderAvatarVP 1 0 29RenderAvatarVP 1 1
30RenderCubeMap 1 1 30RenderCubeMap 1 1
31RenderFarClip 1 256 31RenderFarClip 1 1024
32RenderFlexTimeFactor 1 1.0 32RenderFlexTimeFactor 1 1.0
33RenderFogRatio 1 4.0 33RenderFogRatio 1 4.0
34RenderGamma 1 0 34RenderGamma 1 0
35RenderGlowResolutionPow 1 9 35RenderGlowResolutionPow 1 9
36RenderGround 1 1 36RenderGround 1 1
37RenderLightingDetail 1 1 37RenderLightingDetail 1 1
38RenderMaxPartCount 1 8192 38RenderMaxPartCount 1 8192
39RenderNightBrightness 1 1.0 39RenderNightBrightness 1 1.0
40RenderObjectBump 1 1 40RenderObjectBump 1 1
41RenderReflectionDetail 1 3 41RenderReflectionDetail 1 3
42RenderTerrainDetail 1 1 42RenderTerrainDetail 1 1
43RenderTerrainLODFactor 1 2.0 43RenderTerrainLODFactor 1 2.0
44RenderTreeLODFactor 1 1.0 44RenderTreeLODFactor 1 12.0
45RenderUseImpostors 1 1 45RenderUseImpostors 1 1
46RenderVBOEnable 1 1 46RenderVBOEnable 1 1
47RenderVolumeLODFactor 1 2.0 47RenderVolumeLODFactor 1 4.0
48RenderWaterReflections 1 1 48RenderWaterReflections 1 1
49UseOcclusion 1 1 49UseStartScreen 1 1
50VertexShaderEnable 1 1 50UseOcclusion 1 1
51WindLightUseAtmosShaders 1 1 51VertexShaderEnable 1 1
52WLSkyDetail 1 128 52WindLightUseAtmosShaders 1 1
53RenderUseCleverUI 1 1 53WLSkyDetail 1 128
54Disregard128DefaultDrawDistance 1 1
55Disregard96DefaultDrawDistance 1 1
56RenderTextureMemoryMultiple 1 0.5
57Disregard128DefaultDrawDistance 1 1 54Disregard128DefaultDrawDistance 1 1
58Disregard96DefaultDrawDistance 1 1 55Disregard96DefaultDrawDistance 1 1
56RenderTextureMemoryMultiple 1 1.0
59 57
60// 58//
61// Low Graphics Settings 59// Low Graphics Settings
@@ -74,7 +72,7 @@ RenderObjectBump 1 0
74RenderReflectionDetail 1 0 72RenderReflectionDetail 1 0
75RenderTerrainDetail 1 0 73RenderTerrainDetail 1 0
76RenderTerrainLODFactor 1 1 74RenderTerrainLODFactor 1 1
77RenderTreeLODFactor 1 0.5 75RenderTreeLODFactor 1 2.0
78RenderUseImpostors 1 1 76RenderUseImpostors 1 1
79RenderVolumeLODFactor 1 1.125 77RenderVolumeLODFactor 1 1.125
80RenderWaterReflections 1 0 78RenderWaterReflections 1 0
@@ -90,7 +88,7 @@ RenderAnisotropic 1 0
90RenderAvatarCloth 1 0 88RenderAvatarCloth 1 0
91RenderAvatarLODFactor 1 0.5 89RenderAvatarLODFactor 1 0.5
92RenderAvatarVP 1 1 90RenderAvatarVP 1 1
93RenderFarClip 1 96 91RenderFarClip 1 128
94RenderFlexTimeFactor 1 1.0 92RenderFlexTimeFactor 1 1.0
95RenderGlowResolutionPow 1 8 93RenderGlowResolutionPow 1 8
96RenderLightingDetail 1 1 94RenderLightingDetail 1 1
@@ -99,7 +97,7 @@ RenderObjectBump 1 1
99RenderReflectionDetail 1 0 97RenderReflectionDetail 1 0
100RenderTerrainDetail 1 1 98RenderTerrainDetail 1 1
101RenderTerrainLODFactor 1 1.0 99RenderTerrainLODFactor 1 1.0
102RenderTreeLODFactor 1 0.5 100RenderTreeLODFactor 1 4.0
103RenderUseImpostors 1 1 101RenderUseImpostors 1 1
104RenderVolumeLODFactor 1 1.125 102RenderVolumeLODFactor 1 1.125
105RenderWaterReflections 1 0 103RenderWaterReflections 1 0
@@ -115,7 +113,7 @@ RenderAnisotropic 1 1
115RenderAvatarCloth 1 0 113RenderAvatarCloth 1 0
116RenderAvatarLODFactor 1 1.0 114RenderAvatarLODFactor 1 1.0
117RenderAvatarVP 1 1 115RenderAvatarVP 1 1
118RenderFarClip 1 128 116RenderFarClip 1 256
119RenderFlexTimeFactor 1 1.0 117RenderFlexTimeFactor 1 1.0
120RenderGlowResolutionPow 1 9 118RenderGlowResolutionPow 1 9
121RenderLightingDetail 1 1 119RenderLightingDetail 1 1
@@ -124,9 +122,9 @@ RenderObjectBump 1 1
124RenderReflectionDetail 1 2 122RenderReflectionDetail 1 2
125RenderTerrainDetail 1 1 123RenderTerrainDetail 1 1
126RenderTerrainLODFactor 1 2.0 124RenderTerrainLODFactor 1 2.0
127RenderTreeLODFactor 1 0.5 125RenderTreeLODFactor 1 8.0
128RenderUseImpostors 1 1 126RenderUseImpostors 1 1
129RenderVolumeLODFactor 1 1.125 127RenderVolumeLODFactor 1 2.0
130RenderWaterReflections 1 0 128RenderWaterReflections 1 0
131VertexShaderEnable 1 1 129VertexShaderEnable 1 1
132WindLightUseAtmosShaders 1 1 130WindLightUseAtmosShaders 1 1
@@ -140,7 +138,7 @@ RenderAnisotropic 1 1
140RenderAvatarCloth 1 1 138RenderAvatarCloth 1 1
141RenderAvatarLODFactor 1 1.0 139RenderAvatarLODFactor 1 1.0
142RenderAvatarVP 1 1 140RenderAvatarVP 1 1
143RenderFarClip 1 256 141RenderFarClip 1 1024
144RenderFlexTimeFactor 1 1.0 142RenderFlexTimeFactor 1 1.0
145RenderGlowResolutionPow 1 9 143RenderGlowResolutionPow 1 9
146RenderLightingDetail 1 1 144RenderLightingDetail 1 1
@@ -149,9 +147,9 @@ RenderObjectBump 1 1
149RenderReflectionDetail 1 3 147RenderReflectionDetail 1 3
150RenderTerrainDetail 1 1 148RenderTerrainDetail 1 1
151RenderTerrainLODFactor 1 2.0 149RenderTerrainLODFactor 1 2.0
152RenderTreeLODFactor 1 1.0 150RenderTreeLODFactor 1 12.0
153RenderUseImpostors 1 1 151RenderUseImpostors 1 1
154RenderVolumeLODFactor 1 2.0 152RenderVolumeLODFactor 1 4.0
155RenderWaterReflections 1 1 153RenderWaterReflections 1 1
156VertexShaderEnable 1 1 154VertexShaderEnable 1 1
157WindLightUseAtmosShaders 1 1 155WindLightUseAtmosShaders 1 1