diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:14:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:14:23 -0400 |
commit | 731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (patch) | |
tree | 142060ca39c7e495d05edf7e0359a15716840705 /indra/newview/app_settings/settings.xml | |
parent | 53eff025bc205e3127da4dc0c3df3cb406eb1153 (diff) | |
parent | 171089207b528ab80a954292c127ba77254ee927 (diff) |
merge changes for 3.6.3-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 515199604b..e16d3e6628 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8552,6 +8552,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> |