diff options
author | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
commit | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (patch) | |
tree | b4053044a9d9f95aa7fea445ce8873ae744f74b1 /indra/newview/app_settings/settings.xml | |
parent | 3cb97cb4d75c40d9519d796dd52d0741d354fc97 (diff) | |
parent | c494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 73f63458a3..f41f4b7382 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7329,7 +7329,7 @@ <string>Vector3</string>
<key>Value</key>
<array>
- <real>0.40</real>
+ <real>0.80</real>
<real>1.00</real>
<real>0.00</real>
</array>
@@ -7750,6 +7750,18 @@ <key>Value</key>
<real>0</real>
</map>
+
+ <key>RenderDepthOfField</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether to use depth of field effect when lighting and shadows are enabled</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>RenderSpotLightsInNondeferred</key>
<map>
@@ -8086,7 +8098,7 @@ <key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.1</real>
+ <real>0</real>
</map>
<key>RenderGIAmbiance</key>
@@ -8306,9 +8318,9 @@ <string>Vector3</string>
<key>Value</key>
<array>
- <real>0.299</real>
- <real>0.587</real>
- <real>0.114</real>
+ <real>1</real>
+ <real>0</real>
+ <real>0</real>
</array>
</map>
<key>RenderGlowMaxExtractAlpha</key>
@@ -8320,7 +8332,7 @@ <key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.065</real>
+ <real>0.25</real>
</map>
<key>RenderGlowMinLuminance</key>
<map>
@@ -8331,7 +8343,7 @@ <key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>2.5</real>
+ <real>9999</real>
</map>
<key>RenderGlowResolutionPow</key>
<map>
|