diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c4a0bba2b4..905d96a71a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1721,7 +1721,7 @@ bool LLAppViewer::doFrame() // } //} //last_call = LLTimer::getTotalTime(); - // + // display(); @@ -1831,21 +1831,21 @@ bool LLAppViewer::doFrame() } // FIRE-22297: FPS limiter not working properly on Mac/Linux - static LLCachedControl max_fps(gSavedSettings, "FramePerSecondLimit"); - static LLCachedControl fsLimitFramerate(gSavedSettings, "FSLimitFramerate"); + static LLCachedControl max_fps(gSavedSettings, "FramePerSecondLimit"); + static LLCachedControl fsLimitFramerate(gSavedSettings, "FSLimitFramerate"); if (fsLimitFramerate && LLStartUp::getStartupState() == STATE_STARTED && !gTeleportDisplay && !logoutRequestSent() && max_fps > F_APPROXIMATELY_ZERO) - { - // Sleep a while to limit frame rate. - F32 min_frame_time = 1.f / (F32)max_fps; - S32 milliseconds_to_sleep = llclamp((S32)((min_frame_time - frameTimer.getElapsedTimeF64()) * 1000.f), 0, 1000); - if (milliseconds_to_sleep > 0) - { - LL_RECORD_BLOCK_TIME(FTM_SLEEP); - ms_sleep(milliseconds_to_sleep); - } - } + { + // Sleep a while to limit frame rate. + F32 min_frame_time = 1.f / (F32)max_fps; + S32 milliseconds_to_sleep = llclamp((S32)((min_frame_time - frameTimer.getElapsedTimeF64()) * 1000.f), 0, 1000); + if (milliseconds_to_sleep > 0) + { + LL_RECORD_BLOCK_TIME(FTM_SLEEP); + ms_sleep(milliseconds_to_sleep); + } + } frameTimer.reset(); - // + // resumeMainloopTimeout();