summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-03-01 14:32:49 -0800
committerleyla_linden <none@none>2011-03-01 14:32:49 -0800
commit0a76e7620f3c97571ccd85a0d31392c0235d87ec (patch)
tree0f032cae5c3d6648e6241cd523811d51278f8f27 /indra/newview/app_settings
parentf24a040beb878a5d24519e2a849379f8d7b473bb (diff)
parentfcb205131ccc02b2b50e79ad274ed4ef4fec0330 (diff)
Merge
Diffstat (limited to 'indra/newview/app_settings')
-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 71a611ba90..01610f73ed 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1323,6 +1323,18 @@
<integer>0</integer>
</map>
+ <key>CameraFocusTransitionTime</key>
+ <map>
+ <key>Comment</key>
+ <string>How many seconds it takes the camera to transition between focal distances</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.5</real>
+ </map>
+
<key>CameraFNumber</key>
<map>
<key>Comment</key>