diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-10-22 18:11:48 +0100 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-10-22 18:11:48 +0100 | 
| commit | e5cd9cb90f74c46ad59ba697bb70e7a425bf631d (patch) | |
| tree | 35cf0536f89af885f670a3b788ff534667ce656a /indra/newview/app_settings | |
| parent | 910daee8887b41619b07a1e5c4431f77c095dac5 (diff) | |
| parent | da183230b0f08d50ad35330fc8ef51307a8b6f84 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 17 | 
1 files changed, 3 insertions, 14 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5987bc3ddf..aeeba58a68 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> @@ -3366,13 +3355,13 @@      <key>DisableVerticalSync</key>      <map>        <key>Comment</key> -      <string>Update frames as fast as possible (FALSE = update frames between display scans)</string> +      <string>Update frames as fast as possible (FALSE = update frames between display scans).  Requires restart.</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>1</integer> +      <integer>0</integer>      </map>      <key>EnableGroupChatPopups</key>      <map> @@ -9836,7 +9825,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>0</integer> +      <integer>1</integer>      </map>      <key>RenderGlow</key>      <map> | 
