diff options
author | Dave Parks <davep@lindenlab.com> | 2010-12-10 20:42:29 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-12-10 20:42:29 -0600 |
commit | 6f8ff871cdd0402d07800444f0524079fe02fac6 (patch) | |
tree | 071fc033d8b721934650e79584cd415d3da501bb /indra/newview/app_settings/settings.xml | |
parent | 285ba513368c6b692ea2eb5d13b85300c76adbea (diff) | |
parent | 8e5f15a3b64e1e7cd14c8c4c9535299b93f3496b (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a27492f1c0..0be94ce2d1 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1353,7 +1353,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>11.0</real> + <real>9.0</real> </map> <key>CameraFocalLength</key> @@ -1365,21 +1365,32 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>35</real> + <real>50</real> </map> - <key>CameraCoCRatio</key> + <key>CameraFieldOfView</key> <map> <key>Comment</key> - <string>Ratio of circle of confusion to vertical resolution for DoF effect.</string> + <string>Vertical camera field of view for DoF effect (in degrees)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>F32</string> <key>Value</key> - <real>54</real> + <real>60.0</real> </map> + <key>CameraAspectRatio</key> + <map> + <key>Comment</key> + <string>Camera aspect ratio for DoF effect</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1.5</real> + </map> <key>CertStore</key> <map> @@ -6622,9 +6633,9 @@ <string>Vector3</string> <key>Value</key> <array> - <real>-0.35</real> + <real>-0.75</real> <real>1</real> - <real>0.7</real> + <real>1.0</real> </array> </map> @@ -6638,9 +6649,9 @@ <string>Vector3</string> <key>Value</key> <array> - <real>-1</real> - <real>-1</real> + <real>0.5</real> <real>-0.6</real> + <real>0.4</real> </array> </map> @@ -6654,9 +6665,9 @@ <string>Vector3</string> <key>Value</key> <array> - <real>-0.2</real> + <real>0.5</real> <real>-0.8</real> - <real>-0.2</real> + <real>0.3</real> </array> </map> |