summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:28 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:28 -0500
commitc4989c17ed3848f676364e1927ccad13fb628e2c (patch)
tree70eef4570212f2a6a3bbeec69442ecc1523b972f /indra/newview/app_settings
parent6e671281a26089d7cf947236162afc8013d25ec8 (diff)
parente8423f150ffdd965da5b90ee625a8afc1519626f (diff)
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 05bdb88627..bc181b5f8b 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7705,7 +7705,6 @@
<key>Value</key>
<real>0.01</real>
</map>
-
<key>RenderShadowBiasError</key>
<map>
<key>Comment</key>
@@ -8963,7 +8962,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.125f</real>
+ <real>0.125</real>
</map>
<key>MeshThreadCount</key>
<map>
@@ -11934,7 +11933,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>3.0</integer>
+ <real>3.0</real>
</map>
<key>InterpolationPhaseOut</key>
<map>
@@ -11945,7 +11944,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>1.0</integer>
+ <real>1.0</real>
</map>
<key>VerboseLogs</key>
<map>