diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/CMakeLists.txt | 8 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/high_graphics.xml | 39 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/low_graphics.xml | 39 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/mid_graphics.xml | 39 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/ultra_graphics.xml | 39 | ||||
-rw-r--r-- | linden/indra/newview/featuretable.txt | 26 | ||||
-rw-r--r-- | linden/indra/newview/featuretable_linux.txt | 24 | ||||
-rw-r--r-- | linden/indra/newview/featuretable_mac.txt | 78 |
8 files changed, 66 insertions, 226 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 83ad646..e729e6c 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
@@ -1250,19 +1250,19 @@ set(viewer_APPSETTINGS_FILES | |||
1250 | app_settings/cmd_line.xml | 1250 | app_settings/cmd_line.xml |
1251 | app_settings/default_grids.xml | 1251 | app_settings/default_grids.xml |
1252 | app_settings/grass.xml | 1252 | app_settings/grass.xml |
1253 | app_settings/high_graphics.xml | 1253 | # app_settings/high_graphics.xml |
1254 | app_settings/keys.ini | 1254 | app_settings/keys.ini |
1255 | app_settings/keywords.ini | 1255 | app_settings/keywords.ini |
1256 | app_settings/logcontrol.xml | 1256 | app_settings/logcontrol.xml |
1257 | app_settings/low_graphics.xml | 1257 | # app_settings/low_graphics.xml |
1258 | app_settings/mid_graphics.xml | 1258 | # app_settings/mid_graphics.xml |
1259 | app_settings/settings.xml | 1259 | app_settings/settings.xml |
1260 | app_settings/settings_crash_behavior.xml | 1260 | app_settings/settings_crash_behavior.xml |
1261 | app_settings/settings_files.xml | 1261 | app_settings/settings_files.xml |
1262 | app_settings/settings_per_account.xml | 1262 | app_settings/settings_per_account.xml |
1263 | app_settings/std_bump.ini | 1263 | app_settings/std_bump.ini |
1264 | app_settings/trees.xml | 1264 | app_settings/trees.xml |
1265 | app_settings/ultra_graphics.xml | 1265 | # app_settings/ultra_graphics.xml |
1266 | app_settings/viewerart.xml | 1266 | app_settings/viewerart.xml |
1267 | ${CMAKE_SOURCE_DIR}/../etc/message.xml | 1267 | ${CMAKE_SOURCE_DIR}/../etc/message.xml |
1268 | ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg | 1268 | ${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 c77fd83..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="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="2"/> | ||
23 | <!--Simple--> | ||
24 | <RenderTerrainDetail value="1"/> | ||
25 | <!--Default for now--> | ||
26 | <RenderTerrainLODFactor value="2"/> | ||
27 | <!--Default for now--> | ||
28 | <RenderTreeLODFactor value="8.0"/> | ||
29 | <!--Try Impostors--> | ||
30 | <RenderUseImpostors value="TRUE"/> | ||
31 | <!--Default for now--> | ||
32 | <RenderVolumeLODFactor value="3.0"/> | ||
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 e5407ef..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="1.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 250a682..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="2.0"/> | ||
29 | <!--Try Impostors--> | ||
30 | <RenderUseImpostors value="TRUE"/> | ||
31 | <!--Default for now--> | ||
32 | <RenderVolumeLODFactor value="2.0"/> | ||
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 ba8d8a3..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="1024"/> | ||
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="8192"/> | ||
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="12.0"/> | ||
29 | <!--Try Impostors--> | ||
30 | <RenderUseImpostors value="TRUE"/> | ||
31 | <!--Default for now--> | ||
32 | <RenderVolumeLODFactor value="4.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 | |||
28 | RenderAvatarLODFactor 1 1.0 | 28 | RenderAvatarLODFactor 1 1.0 |
29 | RenderAvatarVP 1 1 | 29 | RenderAvatarVP 1 1 |
30 | RenderCubeMap 1 1 | 30 | RenderCubeMap 1 1 |
31 | RenderFarClip 1 256 | 31 | RenderFarClip 1 1024 |
32 | RenderFlexTimeFactor 1 1.0 | 32 | RenderFlexTimeFactor 1 1.0 |
33 | RenderFogRatio 1 4.0 | 33 | RenderFogRatio 1 4.0 |
34 | RenderGamma 1 0 | 34 | RenderGamma 1 0 |
@@ -41,10 +41,10 @@ RenderObjectBump 1 1 | |||
41 | RenderReflectionDetail 1 3 | 41 | RenderReflectionDetail 1 3 |
42 | RenderTerrainDetail 1 1 | 42 | RenderTerrainDetail 1 1 |
43 | RenderTerrainLODFactor 1 2.0 | 43 | RenderTerrainLODFactor 1 2.0 |
44 | RenderTreeLODFactor 1 1.0 | 44 | RenderTreeLODFactor 1 12.0 |
45 | RenderUseImpostors 1 1 | 45 | RenderUseImpostors 1 1 |
46 | RenderVBOEnable 1 1 | 46 | RenderVBOEnable 1 1 |
47 | RenderVolumeLODFactor 1 2.0 | 47 | RenderVolumeLODFactor 1 4.0 |
48 | RenderWaterReflections 1 1 | 48 | RenderWaterReflections 1 1 |
49 | UseStartScreen 1 1 | 49 | UseStartScreen 1 1 |
50 | UseOcclusion 1 1 | 50 | UseOcclusion 1 1 |
@@ -54,8 +54,6 @@ WLSkyDetail 1 128 | |||
54 | Disregard128DefaultDrawDistance 1 1 | 54 | Disregard128DefaultDrawDistance 1 1 |
55 | Disregard96DefaultDrawDistance 1 1 | 55 | Disregard96DefaultDrawDistance 1 1 |
56 | RenderTextureMemoryMultiple 1 1.0 | 56 | RenderTextureMemoryMultiple 1 1.0 |
57 | RenderShaderLightingMaxLevel 1 3 | ||
58 | |||
59 | 57 | ||
60 | // | 58 | // |
61 | // Low Graphics Settings | 59 | // Low Graphics Settings |
@@ -74,7 +72,7 @@ RenderObjectBump 1 0 | |||
74 | RenderReflectionDetail 1 0 | 72 | RenderReflectionDetail 1 0 |
75 | RenderTerrainDetail 1 0 | 73 | RenderTerrainDetail 1 0 |
76 | RenderTerrainLODFactor 1 1 | 74 | RenderTerrainLODFactor 1 1 |
77 | RenderTreeLODFactor 1 0.5 | 75 | RenderTreeLODFactor 1 2.0 |
78 | RenderUseImpostors 1 1 | 76 | RenderUseImpostors 1 1 |
79 | RenderVolumeLODFactor 1 1.125 | 77 | RenderVolumeLODFactor 1 1.125 |
80 | RenderWaterReflections 1 0 | 78 | RenderWaterReflections 1 0 |
@@ -90,7 +88,7 @@ RenderAnisotropic 1 0 | |||
90 | RenderAvatarCloth 1 0 | 88 | RenderAvatarCloth 1 0 |
91 | RenderAvatarLODFactor 1 0.5 | 89 | RenderAvatarLODFactor 1 0.5 |
92 | RenderAvatarVP 1 1 | 90 | RenderAvatarVP 1 1 |
93 | RenderFarClip 1 96 | 91 | RenderFarClip 1 128 |
94 | RenderFlexTimeFactor 1 1.0 | 92 | RenderFlexTimeFactor 1 1.0 |
95 | RenderGlowResolutionPow 1 8 | 93 | RenderGlowResolutionPow 1 8 |
96 | RenderLightingDetail 1 1 | 94 | RenderLightingDetail 1 1 |
@@ -99,7 +97,7 @@ RenderObjectBump 1 1 | |||
99 | RenderReflectionDetail 1 0 | 97 | RenderReflectionDetail 1 0 |
100 | RenderTerrainDetail 1 1 | 98 | RenderTerrainDetail 1 1 |
101 | RenderTerrainLODFactor 1 1.0 | 99 | RenderTerrainLODFactor 1 1.0 |
102 | RenderTreeLODFactor 1 0.5 | 100 | RenderTreeLODFactor 1 4.0 |
103 | RenderUseImpostors 1 1 | 101 | RenderUseImpostors 1 1 |
104 | RenderVolumeLODFactor 1 1.125 | 102 | RenderVolumeLODFactor 1 1.125 |
105 | RenderWaterReflections 1 0 | 103 | RenderWaterReflections 1 0 |
@@ -115,7 +113,7 @@ RenderAnisotropic 1 1 | |||
115 | RenderAvatarCloth 1 0 | 113 | RenderAvatarCloth 1 0 |
116 | RenderAvatarLODFactor 1 1.0 | 114 | RenderAvatarLODFactor 1 1.0 |
117 | RenderAvatarVP 1 1 | 115 | RenderAvatarVP 1 1 |
118 | RenderFarClip 1 128 | 116 | RenderFarClip 1 256 |
119 | RenderFlexTimeFactor 1 1.0 | 117 | RenderFlexTimeFactor 1 1.0 |
120 | RenderGlowResolutionPow 1 9 | 118 | RenderGlowResolutionPow 1 9 |
121 | RenderLightingDetail 1 1 | 119 | RenderLightingDetail 1 1 |
@@ -124,9 +122,9 @@ RenderObjectBump 1 1 | |||
124 | RenderReflectionDetail 1 2 | 122 | RenderReflectionDetail 1 2 |
125 | RenderTerrainDetail 1 1 | 123 | RenderTerrainDetail 1 1 |
126 | RenderTerrainLODFactor 1 2.0 | 124 | RenderTerrainLODFactor 1 2.0 |
127 | RenderTreeLODFactor 1 0.5 | 125 | RenderTreeLODFactor 1 8.0 |
128 | RenderUseImpostors 1 1 | 126 | RenderUseImpostors 1 1 |
129 | RenderVolumeLODFactor 1 1.125 | 127 | RenderVolumeLODFactor 1 2.0 |
130 | RenderWaterReflections 1 0 | 128 | RenderWaterReflections 1 0 |
131 | VertexShaderEnable 1 1 | 129 | VertexShaderEnable 1 1 |
132 | WindLightUseAtmosShaders 1 1 | 130 | WindLightUseAtmosShaders 1 1 |
@@ -140,7 +138,7 @@ RenderAnisotropic 1 1 | |||
140 | RenderAvatarCloth 1 1 | 138 | RenderAvatarCloth 1 1 |
141 | RenderAvatarLODFactor 1 1.0 | 139 | RenderAvatarLODFactor 1 1.0 |
142 | RenderAvatarVP 1 1 | 140 | RenderAvatarVP 1 1 |
143 | RenderFarClip 1 256 | 141 | RenderFarClip 1 1024 |
144 | RenderFlexTimeFactor 1 1.0 | 142 | RenderFlexTimeFactor 1 1.0 |
145 | RenderGlowResolutionPow 1 9 | 143 | RenderGlowResolutionPow 1 9 |
146 | RenderLightingDetail 1 1 | 144 | RenderLightingDetail 1 1 |
@@ -149,9 +147,9 @@ RenderObjectBump 1 1 | |||
149 | RenderReflectionDetail 1 3 | 147 | RenderReflectionDetail 1 3 |
150 | RenderTerrainDetail 1 1 | 148 | RenderTerrainDetail 1 1 |
151 | RenderTerrainLODFactor 1 2.0 | 149 | RenderTerrainLODFactor 1 2.0 |
152 | RenderTreeLODFactor 1 1.0 | 150 | RenderTreeLODFactor 1 12.0 |
153 | RenderUseImpostors 1 1 | 151 | RenderUseImpostors 1 1 |
154 | RenderVolumeLODFactor 1 2.0 | 152 | RenderVolumeLODFactor 1 4.0 |
155 | RenderWaterReflections 1 1 | 153 | RenderWaterReflections 1 1 |
156 | VertexShaderEnable 1 1 | 154 | VertexShaderEnable 1 1 |
157 | WindLightUseAtmosShaders 1 1 | 155 | WindLightUseAtmosShaders 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 | |||
28 | RenderAvatarLODFactor 1 1.0 | 28 | RenderAvatarLODFactor 1 1.0 |
29 | RenderAvatarVP 1 1 | 29 | RenderAvatarVP 1 1 |
30 | RenderCubeMap 1 1 | 30 | RenderCubeMap 1 1 |
31 | RenderFarClip 1 256 | 31 | RenderFarClip 1 1024 |
32 | RenderFlexTimeFactor 1 1.0 | 32 | RenderFlexTimeFactor 1 1.0 |
33 | RenderFogRatio 1 4.0 | 33 | RenderFogRatio 1 4.0 |
34 | RenderGamma 1 0 | 34 | RenderGamma 1 0 |
@@ -41,10 +41,10 @@ RenderObjectBump 1 1 | |||
41 | RenderReflectionDetail 1 3 | 41 | RenderReflectionDetail 1 3 |
42 | RenderTerrainDetail 1 1 | 42 | RenderTerrainDetail 1 1 |
43 | RenderTerrainLODFactor 1 2.0 | 43 | RenderTerrainLODFactor 1 2.0 |
44 | RenderTreeLODFactor 1 1.0 | 44 | RenderTreeLODFactor 1 12.0 |
45 | RenderUseImpostors 1 1 | 45 | RenderUseImpostors 1 1 |
46 | RenderVBOEnable 1 1 | 46 | RenderVBOEnable 1 1 |
47 | RenderVolumeLODFactor 1 2.0 | 47 | RenderVolumeLODFactor 1 4.0 |
48 | RenderWaterReflections 1 1 | 48 | RenderWaterReflections 1 1 |
49 | UseStartScreen 1 1 | 49 | UseStartScreen 1 1 |
50 | UseOcclusion 1 1 | 50 | UseOcclusion 1 1 |
@@ -72,7 +72,7 @@ RenderObjectBump 1 0 | |||
72 | RenderReflectionDetail 1 0 | 72 | RenderReflectionDetail 1 0 |
73 | RenderTerrainDetail 1 0 | 73 | RenderTerrainDetail 1 0 |
74 | RenderTerrainLODFactor 1 1 | 74 | RenderTerrainLODFactor 1 1 |
75 | RenderTreeLODFactor 1 0.5 | 75 | RenderTreeLODFactor 1 2.0 |
76 | RenderUseImpostors 1 1 | 76 | RenderUseImpostors 1 1 |
77 | RenderVolumeLODFactor 1 1.125 | 77 | RenderVolumeLODFactor 1 1.125 |
78 | RenderWaterReflections 1 0 | 78 | RenderWaterReflections 1 0 |
@@ -88,7 +88,7 @@ RenderAnisotropic 1 0 | |||
88 | RenderAvatarCloth 1 0 | 88 | RenderAvatarCloth 1 0 |
89 | RenderAvatarLODFactor 1 0.5 | 89 | RenderAvatarLODFactor 1 0.5 |
90 | RenderAvatarVP 1 1 | 90 | RenderAvatarVP 1 1 |
91 | RenderFarClip 1 96 | 91 | RenderFarClip 1 128 |
92 | RenderFlexTimeFactor 1 1.0 | 92 | RenderFlexTimeFactor 1 1.0 |
93 | RenderGlowResolutionPow 1 8 | 93 | RenderGlowResolutionPow 1 8 |
94 | RenderLightingDetail 1 1 | 94 | RenderLightingDetail 1 1 |
@@ -97,7 +97,7 @@ RenderObjectBump 1 1 | |||
97 | RenderReflectionDetail 1 0 | 97 | RenderReflectionDetail 1 0 |
98 | RenderTerrainDetail 1 1 | 98 | RenderTerrainDetail 1 1 |
99 | RenderTerrainLODFactor 1 1.0 | 99 | RenderTerrainLODFactor 1 1.0 |
100 | RenderTreeLODFactor 1 0.5 | 100 | RenderTreeLODFactor 1 4.0 |
101 | RenderUseImpostors 1 1 | 101 | RenderUseImpostors 1 1 |
102 | RenderVolumeLODFactor 1 1.125 | 102 | RenderVolumeLODFactor 1 1.125 |
103 | RenderWaterReflections 1 0 | 103 | RenderWaterReflections 1 0 |
@@ -113,7 +113,7 @@ RenderAnisotropic 1 1 | |||
113 | RenderAvatarCloth 1 0 | 113 | RenderAvatarCloth 1 0 |
114 | RenderAvatarLODFactor 1 1.0 | 114 | RenderAvatarLODFactor 1 1.0 |
115 | RenderAvatarVP 1 1 | 115 | RenderAvatarVP 1 1 |
116 | RenderFarClip 1 128 | 116 | RenderFarClip 1 256 |
117 | RenderFlexTimeFactor 1 1.0 | 117 | RenderFlexTimeFactor 1 1.0 |
118 | RenderGlowResolutionPow 1 9 | 118 | RenderGlowResolutionPow 1 9 |
119 | RenderLightingDetail 1 1 | 119 | RenderLightingDetail 1 1 |
@@ -122,9 +122,9 @@ RenderObjectBump 1 1 | |||
122 | RenderReflectionDetail 1 2 | 122 | RenderReflectionDetail 1 2 |
123 | RenderTerrainDetail 1 1 | 123 | RenderTerrainDetail 1 1 |
124 | RenderTerrainLODFactor 1 2.0 | 124 | RenderTerrainLODFactor 1 2.0 |
125 | RenderTreeLODFactor 1 0.5 | 125 | RenderTreeLODFactor 1 8.0 |
126 | RenderUseImpostors 1 1 | 126 | RenderUseImpostors 1 1 |
127 | RenderVolumeLODFactor 1 1.125 | 127 | RenderVolumeLODFactor 1 2.0 |
128 | RenderWaterReflections 1 0 | 128 | RenderWaterReflections 1 0 |
129 | VertexShaderEnable 1 1 | 129 | VertexShaderEnable 1 1 |
130 | WindLightUseAtmosShaders 1 1 | 130 | WindLightUseAtmosShaders 1 1 |
@@ -138,7 +138,7 @@ RenderAnisotropic 1 1 | |||
138 | RenderAvatarCloth 1 1 | 138 | RenderAvatarCloth 1 1 |
139 | RenderAvatarLODFactor 1 1.0 | 139 | RenderAvatarLODFactor 1 1.0 |
140 | RenderAvatarVP 1 1 | 140 | RenderAvatarVP 1 1 |
141 | RenderFarClip 1 256 | 141 | RenderFarClip 1 1024 |
142 | RenderFlexTimeFactor 1 1.0 | 142 | RenderFlexTimeFactor 1 1.0 |
143 | RenderGlowResolutionPow 1 9 | 143 | RenderGlowResolutionPow 1 9 |
144 | RenderLightingDetail 1 1 | 144 | RenderLightingDetail 1 1 |
@@ -147,9 +147,9 @@ RenderObjectBump 1 1 | |||
147 | RenderReflectionDetail 1 3 | 147 | RenderReflectionDetail 1 3 |
148 | RenderTerrainDetail 1 1 | 148 | RenderTerrainDetail 1 1 |
149 | RenderTerrainLODFactor 1 2.0 | 149 | RenderTerrainLODFactor 1 2.0 |
150 | RenderTreeLODFactor 1 1.0 | 150 | RenderTreeLODFactor 1 12.0 |
151 | RenderUseImpostors 1 1 | 151 | RenderUseImpostors 1 1 |
152 | RenderVolumeLODFactor 1 2.0 | 152 | RenderVolumeLODFactor 1 4.0 |
153 | RenderWaterReflections 1 1 | 153 | RenderWaterReflections 1 1 |
154 | VertexShaderEnable 1 1 | 154 | VertexShaderEnable 1 1 |
155 | WindLightUseAtmosShaders 1 1 | 155 | WindLightUseAtmosShaders 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 | // |
25 | list all | 25 | list all |
26 | RenderAnisotropic 1 0 | 26 | RenderAnisotropic 1 0 |
27 | RenderAvatarCloth 0 0 | 27 | RenderAvatarCloth 1 1 |
28 | RenderAvatarLODFactor 1 1.0 | 28 | RenderAvatarLODFactor 1 1.0 |
29 | RenderAvatarVP 1 0 | 29 | RenderAvatarVP 1 1 |
30 | RenderCubeMap 1 1 | 30 | RenderCubeMap 1 1 |
31 | RenderFarClip 1 256 | 31 | RenderFarClip 1 1024 |
32 | RenderFlexTimeFactor 1 1.0 | 32 | RenderFlexTimeFactor 1 1.0 |
33 | RenderFogRatio 1 4.0 | 33 | RenderFogRatio 1 4.0 |
34 | RenderGamma 1 0 | 34 | RenderGamma 1 0 |
35 | RenderGlowResolutionPow 1 9 | 35 | RenderGlowResolutionPow 1 9 |
36 | RenderGround 1 1 | 36 | RenderGround 1 1 |
37 | RenderLightingDetail 1 1 | 37 | RenderLightingDetail 1 1 |
38 | RenderMaxPartCount 1 8192 | 38 | RenderMaxPartCount 1 8192 |
39 | RenderNightBrightness 1 1.0 | 39 | RenderNightBrightness 1 1.0 |
40 | RenderObjectBump 1 1 | 40 | RenderObjectBump 1 1 |
41 | RenderReflectionDetail 1 3 | 41 | RenderReflectionDetail 1 3 |
42 | RenderTerrainDetail 1 1 | 42 | RenderTerrainDetail 1 1 |
43 | RenderTerrainLODFactor 1 2.0 | 43 | RenderTerrainLODFactor 1 2.0 |
44 | RenderTreeLODFactor 1 1.0 | 44 | RenderTreeLODFactor 1 12.0 |
45 | RenderUseImpostors 1 1 | 45 | RenderUseImpostors 1 1 |
46 | RenderVBOEnable 1 1 | 46 | RenderVBOEnable 1 1 |
47 | RenderVolumeLODFactor 1 2.0 | 47 | RenderVolumeLODFactor 1 4.0 |
48 | RenderWaterReflections 1 1 | 48 | RenderWaterReflections 1 1 |
49 | UseOcclusion 1 1 | 49 | UseStartScreen 1 1 |
50 | VertexShaderEnable 1 1 | 50 | UseOcclusion 1 1 |
51 | WindLightUseAtmosShaders 1 1 | 51 | VertexShaderEnable 1 1 |
52 | WLSkyDetail 1 128 | 52 | WindLightUseAtmosShaders 1 1 |
53 | RenderUseCleverUI 1 1 | 53 | WLSkyDetail 1 128 |
54 | Disregard128DefaultDrawDistance 1 1 | ||
55 | Disregard96DefaultDrawDistance 1 1 | ||
56 | RenderTextureMemoryMultiple 1 0.5 | ||
57 | Disregard128DefaultDrawDistance 1 1 | 54 | Disregard128DefaultDrawDistance 1 1 |
58 | Disregard96DefaultDrawDistance 1 1 | 55 | Disregard96DefaultDrawDistance 1 1 |
56 | RenderTextureMemoryMultiple 1 1.0 | ||
59 | 57 | ||
60 | // | 58 | // |
61 | // Low Graphics Settings | 59 | // Low Graphics Settings |
@@ -74,7 +72,7 @@ RenderObjectBump 1 0 | |||
74 | RenderReflectionDetail 1 0 | 72 | RenderReflectionDetail 1 0 |
75 | RenderTerrainDetail 1 0 | 73 | RenderTerrainDetail 1 0 |
76 | RenderTerrainLODFactor 1 1 | 74 | RenderTerrainLODFactor 1 1 |
77 | RenderTreeLODFactor 1 0.5 | 75 | RenderTreeLODFactor 1 2.0 |
78 | RenderUseImpostors 1 1 | 76 | RenderUseImpostors 1 1 |
79 | RenderVolumeLODFactor 1 1.125 | 77 | RenderVolumeLODFactor 1 1.125 |
80 | RenderWaterReflections 1 0 | 78 | RenderWaterReflections 1 0 |
@@ -90,7 +88,7 @@ RenderAnisotropic 1 0 | |||
90 | RenderAvatarCloth 1 0 | 88 | RenderAvatarCloth 1 0 |
91 | RenderAvatarLODFactor 1 0.5 | 89 | RenderAvatarLODFactor 1 0.5 |
92 | RenderAvatarVP 1 1 | 90 | RenderAvatarVP 1 1 |
93 | RenderFarClip 1 96 | 91 | RenderFarClip 1 128 |
94 | RenderFlexTimeFactor 1 1.0 | 92 | RenderFlexTimeFactor 1 1.0 |
95 | RenderGlowResolutionPow 1 8 | 93 | RenderGlowResolutionPow 1 8 |
96 | RenderLightingDetail 1 1 | 94 | RenderLightingDetail 1 1 |
@@ -99,7 +97,7 @@ RenderObjectBump 1 1 | |||
99 | RenderReflectionDetail 1 0 | 97 | RenderReflectionDetail 1 0 |
100 | RenderTerrainDetail 1 1 | 98 | RenderTerrainDetail 1 1 |
101 | RenderTerrainLODFactor 1 1.0 | 99 | RenderTerrainLODFactor 1 1.0 |
102 | RenderTreeLODFactor 1 0.5 | 100 | RenderTreeLODFactor 1 4.0 |
103 | RenderUseImpostors 1 1 | 101 | RenderUseImpostors 1 1 |
104 | RenderVolumeLODFactor 1 1.125 | 102 | RenderVolumeLODFactor 1 1.125 |
105 | RenderWaterReflections 1 0 | 103 | RenderWaterReflections 1 0 |
@@ -115,7 +113,7 @@ RenderAnisotropic 1 1 | |||
115 | RenderAvatarCloth 1 0 | 113 | RenderAvatarCloth 1 0 |
116 | RenderAvatarLODFactor 1 1.0 | 114 | RenderAvatarLODFactor 1 1.0 |
117 | RenderAvatarVP 1 1 | 115 | RenderAvatarVP 1 1 |
118 | RenderFarClip 1 128 | 116 | RenderFarClip 1 256 |
119 | RenderFlexTimeFactor 1 1.0 | 117 | RenderFlexTimeFactor 1 1.0 |
120 | RenderGlowResolutionPow 1 9 | 118 | RenderGlowResolutionPow 1 9 |
121 | RenderLightingDetail 1 1 | 119 | RenderLightingDetail 1 1 |
@@ -124,9 +122,9 @@ RenderObjectBump 1 1 | |||
124 | RenderReflectionDetail 1 2 | 122 | RenderReflectionDetail 1 2 |
125 | RenderTerrainDetail 1 1 | 123 | RenderTerrainDetail 1 1 |
126 | RenderTerrainLODFactor 1 2.0 | 124 | RenderTerrainLODFactor 1 2.0 |
127 | RenderTreeLODFactor 1 0.5 | 125 | RenderTreeLODFactor 1 8.0 |
128 | RenderUseImpostors 1 1 | 126 | RenderUseImpostors 1 1 |
129 | RenderVolumeLODFactor 1 1.125 | 127 | RenderVolumeLODFactor 1 2.0 |
130 | RenderWaterReflections 1 0 | 128 | RenderWaterReflections 1 0 |
131 | VertexShaderEnable 1 1 | 129 | VertexShaderEnable 1 1 |
132 | WindLightUseAtmosShaders 1 1 | 130 | WindLightUseAtmosShaders 1 1 |
@@ -140,7 +138,7 @@ RenderAnisotropic 1 1 | |||
140 | RenderAvatarCloth 1 1 | 138 | RenderAvatarCloth 1 1 |
141 | RenderAvatarLODFactor 1 1.0 | 139 | RenderAvatarLODFactor 1 1.0 |
142 | RenderAvatarVP 1 1 | 140 | RenderAvatarVP 1 1 |
143 | RenderFarClip 1 256 | 141 | RenderFarClip 1 1024 |
144 | RenderFlexTimeFactor 1 1.0 | 142 | RenderFlexTimeFactor 1 1.0 |
145 | RenderGlowResolutionPow 1 9 | 143 | RenderGlowResolutionPow 1 9 |
146 | RenderLightingDetail 1 1 | 144 | RenderLightingDetail 1 1 |
@@ -149,9 +147,9 @@ RenderObjectBump 1 1 | |||
149 | RenderReflectionDetail 1 3 | 147 | RenderReflectionDetail 1 3 |
150 | RenderTerrainDetail 1 1 | 148 | RenderTerrainDetail 1 1 |
151 | RenderTerrainLODFactor 1 2.0 | 149 | RenderTerrainLODFactor 1 2.0 |
152 | RenderTreeLODFactor 1 1.0 | 150 | RenderTreeLODFactor 1 12.0 |
153 | RenderUseImpostors 1 1 | 151 | RenderUseImpostors 1 1 |
154 | RenderVolumeLODFactor 1 2.0 | 152 | RenderVolumeLODFactor 1 4.0 |
155 | RenderWaterReflections 1 1 | 153 | RenderWaterReflections 1 1 |
156 | VertexShaderEnable 1 1 | 154 | VertexShaderEnable 1 1 |
157 | WindLightUseAtmosShaders 1 1 | 155 | WindLightUseAtmosShaders 1 1 |