summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-18 13:23:01 -0500
committerLoren Shih <seraph@lindenlab.com>2010-11-18 13:23:01 -0500
commit61daa3133a7c4f62d1d9654719d7080020b6cc7a (patch)
tree69e615cce969934047c9beee753b35d212f45de1 /indra/newview/app_settings
parentd76e0dd87f64258ade944323eb5cb6063bca7444 (diff)
parent80364035a10ad28473002d80e575e14e041ac089 (diff)
automated merge from viewer-development-shining
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 561456c9d6..aad2fe3276 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8340,6 +8340,17 @@
<key>Value</key>
<real>1.0</real>
</map>
+ <key>RenderTransparentWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Render water as transparent. Setting to false renders water as opaque with a simple texture applied.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>RenderTreeLODFactor</key>
<map>
<key>Comment</key>