diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
commit | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (patch) | |
tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/app_settings/settings.xml | |
parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
parent | eb6c8c937e214f58cc4da48bd4db455315de4c20 (diff) |
Merged in DV510-merge-6.4.10 (pull request #322)
Merge master v 6.4.10 to DRTVWR-510
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c595a1c176..8d5a97d1cb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -812,17 +812,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>FramePerSecondLimit</key> - <map> - <key>Comment</key> - <string>Controls upper limit of frames per second</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>U32</string> - <key>Value</key> - <integer>120</integer> - </map> <key>BackgroundYieldTime</key> <map> <key>Comment</key> |