summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml194
1 files changed, 69 insertions, 125 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 07418d1b5e..810b2d9a1d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1741,17 +1741,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DebugAvatarLocalTexLoadedTime</key>
- <map>
- <key>Comment</key>
- <string>Display time for loading avatar local textures.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>DebugBeaconLineWidth</key>
<map>
<key>Comment</key>
@@ -5384,6 +5373,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>MultipleAttachments</key>
+ <map>
+ <key>Comment</key>
+ <string>Allow multiple objects to be attached to a single attachment point.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>MuteAmbient</key>
<map>
<key>Comment</key>
@@ -6748,7 +6748,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>200</integer>
+ <integer>60</integer>
</map>
<key>RenderSSAOFactor</key>
<map>
@@ -7123,64 +7123,6 @@
<real>0.01</real>
</map>
- <key>RenderShadowBiasError</key>
- <map>
- <key>Comment</key>
- <string>Error scale for shadow bias (based on altitude).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0</real>
- </map>
- <key>RenderShadowOffsetError</key>
- <map>
- <key>Comment</key>
- <string>Error scale for shadow offset (based on altitude).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0</real>
- </map>
-
- <key>RenderSpotLightsInNondeferred</key>
- <map>
- <key>Comment</key>
- <string>Whether to support projectors as spotlights when Lighting and Shadows is disabled</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
-
- <key>RenderSpotShadowBias</key>
- <map>
- <key>Comment</key>
- <string>Bias value for shadows (prevent shadow acne).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>RenderSpotShadowOffset</key>
- <map>
- <key>Comment</key>
- <string>Offset value for shadows (prevent shadow acne).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.04</real>
- </map>
-
<key>RenderShadowResolutionScale</key>
<map>
<key>Comment</key>
@@ -7193,6 +7135,8 @@
<real>1.0</real>
</map>
+
+
<key>RenderDeferredTreeShadowBias</key>
<map>
<key>Comment</key>
@@ -7314,7 +7258,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>8</real>
+ <real>1</real>
</map>
<key>RenderDeferred</key>
@@ -7329,6 +7273,18 @@
<integer>0</integer>
</map>
+ <key>RenderDeferredShadow</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable shadows in deferred renderer.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+
<key>RenderDeferredGI</key>
<map>
<key>Comment</key>
@@ -7341,10 +7297,10 @@
<integer>0</integer>
</map>
- <key>RenderDeferredSun</key>
+ <key>RenderDeferredSunShadow</key>
<map>
<key>Comment</key>
- <string>Execute sunlight shader in deferred renderer.</string>
+ <string>Generate shadows from the sun.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7353,10 +7309,10 @@
<integer>1</integer>
</map>
- <key>RenderDeferredAtmospheric</key>
+ <key>RenderDeferredSun</key>
<map>
<key>Comment</key>
- <string>Execute atmospheric shader in deferred renderer.</string>
+ <string>Execute sunlight shader in deferred renderer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7365,10 +7321,10 @@
<integer>1</integer>
</map>
- <key>RenderDeferredSSAO</key>
+ <key>RenderDeferredAtmospheric</key>
<map>
<key>Comment</key>
- <string>Execute screen space ambient occlusion shader in deferred renderer.</string>
+ <string>Execute atmospheric shader in deferred renderer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7627,10 +7583,10 @@
<key>Value</key>
<real>256.0</real>
</map>
- <key>RenderAutoMaskAlphaNonDeferred</key>
+ <key>RenderFastAlpha</key>
<map>
<key>Comment</key>
- <string>Use alpha masks where appropriate, in the non-deferred (non-'Lighting and Shadows') graphics mode</string>
+ <string>Use lossy alpha rendering optimization (opaque/nonexistent small alpha faces).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7638,17 +7594,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>RenderAutoMaskAlphaDeferred</key>
- <map>
- <key>Comment</key>
- <string>Use alpha masks where appropriate, in the deferred ('Lighting and Shadows') graphics mode</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>RenderFastUI</key>
<map>
<key>Comment</key>
@@ -7910,6 +7855,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>RenderLightingDetail</key>
+ <map>
+ <key>Comment</key>
+ <string>Amount of detail for lighting objects/avatars/terrain (0=sun/moon only, 1=enable local lights)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>RenderMaxPartCount</key>
<map>
<key>Comment</key>
@@ -8009,18 +7965,6 @@
<key>Value</key>
<integer>2</integer>
</map>
- <key>RenderShadowDetail</key>
- <map>
- <key>Comment</key>
- <string>Detail of shadows.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
-
<key>RenderReflectionRes</key>
<map>
<key>Comment</key>
@@ -8151,7 +8095,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>RenderUIBuffer</key>
<map>
@@ -8307,6 +8251,17 @@
<key>Value</key>
<integer>512</integer>
</map>
+ <key>RenderWaterReflections</key>
+ <map>
+ <key>Comment</key>
+ <string>Reflect the environment in the water.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>RotateRight</key>
<map>
<key>Comment</key>
@@ -8329,6 +8284,17 @@
<key>Value</key>
<real>1.0</real>
</map>
+ <key>RunMultipleThreads</key>
+ <map>
+ <key>Comment</key>
+ <string>If TRUE keep background threads active during render</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>SafeMode</key>
<map>
<key>Comment</key>
@@ -9495,28 +9461,6 @@
<key>Value</key>
<integer>75</integer>
</map>
- <key>SnapshotSharingEnabled</key>
- <map>
- <key>Comment</key>
- <string>Enable uploading of snapshots to a web service.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>SnapshotConfigURL</key>
- <map>
- <key>Comment</key>
- <string>URL to fetch Snapshot Sharing configuration data from.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>http://photos.apps.staging.avatarsunited.com/viewer_config</string>
- </map>
<key>SnapshotTextureLastResolution</key>
<map>
<key>Comment</key>