diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-01-21 13:29:05 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-01-21 13:29:05 +0800 |
| commit | 71577cea319238b54b283a25ee9270e10f11a0bc (patch) | |
| tree | 8b26dee2fb5f56925c1dbd0c0e09be104677c46d /indra/newview/llappviewer.cpp | |
| parent | f301d1c4afa30b3a2845ea9b92a6ed0561e58b78 (diff) | |
| parent | ca6601cbb8d4ef9828466c8d1316ae28d0c7b7b8 (diff) | |
Merge tag 'Second_Life_Release#ca6601cb-2026.01' into 2026.01
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 93f0142994..902387e265 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1373,6 +1373,8 @@ bool LLAppViewer::frame() bool LLAppViewer::doFrame() { + resumeMainloopTimeout("Main:doFrameStart"); + U32 fpsLimitMaxFps = (U32)gSavedSettings.getU32("MaxFPS"); if(fpsLimitMaxFps > 120) fpsLimitMaxFps = 0; @@ -1717,6 +1719,11 @@ bool LLAppViewer::doFrame() LL_INFOS() << "Exiting main_loop" << LL_ENDL; } }LLPerfStats::StatsRecorder::endFrame(); + + // Not viewer's fault if something outside frame + // pauses viewer (ex: macOS doesn't call oneFrame), + // so stop tracking on exit. + pauseMainloopTimeout(); LL_PROFILER_FRAME_END; return ! LLApp::isRunning(); @@ -5963,7 +5970,8 @@ F32 LLAppViewer::getMainloopTimeoutSec() const if (LLStartUp::getStartupState() == STATE_STARTED && gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) { - static LLCachedControl<F32> mainloop_started(gSavedSettings, "MainloopTimeoutStarted", 30.f); + // consider making this value match 'disconnected' timout. + static LLCachedControl<F32> mainloop_started(gSavedSettings, "MainloopTimeoutStarted", 60.f); return mainloop_started(); } else |