diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:11:04 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:11:04 +0200 |
| commit | cd831c4228219a539d0e5d46666ea4f0249975d5 (patch) | |
| tree | 6a8b224fc0fd65a5dd93592a531ff675bce87e55 /indra/newview/app_settings | |
| parent | 071e0ff36b510f66100ca338c8ef923858d8c451 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fd3f85acdd..b7fb1aafac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -812,6 +812,17 @@ <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> @@ -5231,6 +5242,17 @@ <key>Value</key> <string /> </map> + <key>JoystickDeviceUUID</key> + <map> + <key>Comment</key> + <string>Preffered device ID.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>JoystickMouselookYaw</key> <map> <key>Comment</key> |