summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
committerDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
commit9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch)
tree93be8f1dd703cd87083cf871c1948671e0a8cb97 /indra/newview/app_settings/settings.xml
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
parentf62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 12ca902c59..3e022f6fa3 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8446,6 +8446,18 @@
<integer>0</integer>
</map>
+ <key>RenderDepthOfFieldInEditMode</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether to use depth of field effect when in edit mode</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+
<key>CameraDoFResScale</key>
<map>
<key>Comment</key>