diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-12-12 11:57:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 11:57:07 -0800 |
| commit | 24bb1e58f87bbc42ec006d1eb107091c709b6de3 (patch) | |
| tree | 99031882ec6fd39473d8b67f5cb06f8d38d8be2f /indra/newview/app_settings | |
| parent | 43341b7aa9c883066c6d31da929cc30732da66f9 (diff) | |
| parent | f4eec813a3043e2277ae62da6a829c65887d0785 (diff) | |
Merge branch 'develop' into rider/privileged_land
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dbb5dca1f..d7df8aeb44 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4484,13 +4484,24 @@ <key>MainloopTimeoutDefault</key> <map> <key>Comment</key> - <string>Timeout duration for mainloop lock detection, in seconds.</string> + <string>Timeout duration for mainloop lock detection during teleports, login and logout, in seconds.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>F32</string> <key>Value</key> - <real>60.0</real> + <real>120.0</real> + </map> + <key>MainloopTimeoutStarted</key> + <map> + <key>Comment</key> + <string>Timeout duration for mainloop lock detection when logged in and not teleporting, in seconds.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>30.0</real> </map> <key>MapScale</key> <map> @@ -7324,7 +7335,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>32.0</real> + <real>48.0</real> </map> <key>RenderCPUBasis</key> <map> @@ -13862,13 +13873,13 @@ <key>WatchdogEnabled</key> <map> <key>Comment</key> - <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string> + <string>Controls whether the thread watchdog timer is activated. Value is S32. Set to -1 to defer to built-in default.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>WaterGLFogDensityScale</key> <map> |