diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-02-10 14:59:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-10 14:59:36 -0500 |
| commit | e7cc46743b0a032a3091b3ea6922a4af07e5172a (patch) | |
| tree | a7ec6a161693d5685c6a30b602b4c3c02752153b /indra/newview/llappviewer.cpp | |
| parent | 53fb215df1101e690d6b03600cb52eeaf38a9c26 (diff) | |
| parent | b4a6af57a667d355e7347f1a3c13173b44b361ff (diff) | |
Merge pull request #5402 from secondlife/release/2026.01
26.01 -> 26.02
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e016d0e341..f89b11fafe 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1349,6 +1349,7 @@ bool LLAppViewer::frame() bool LLAppViewer::doFrame() { + resumeMainloopTimeout("Main:doFrameStart"); #ifdef LL_DISCORD { LL_PROFILE_ZONE_NAMED("discord_callbacks"); @@ -1662,6 +1663,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(); @@ -5933,7 +5939,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 |