diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-24 09:33:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 09:33:58 +0300 |
| commit | f32d3767dc6f0d4d831882135d2eb88ee96ba79d (patch) | |
| tree | 21685bf5688d93ee583d6f7059fdf5ccb7cea5f2 /indra/newview/llviewerdisplay.cpp | |
| parent | 25e9c61eef179c7ad79d19261f72c1bc85a3ff1b (diff) | |
| parent | 57e78ed43b61864a6b8a54df95d8823daaeb5fe8 (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index adcf91f4ed..fbbcf9bd84 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -654,7 +654,7 @@ void display(bool rebuild, F32 zoom_factor, int subfield, bool for_snapshot) gPipeline.resetFrameStats(); // Reset per-frame statistics. - if (!gDisconnected) + if (!gDisconnected && !LLApp::isExiting()) { // Render mirrors and associated hero probes before we render the rest of the scene. // This ensures the scene state in the hero probes are exactly the same as the rest of the scene before we render it. @@ -1596,7 +1596,7 @@ void render_ui_2d() } - if (gSavedSettings.getBOOL("RenderUIBuffer")) + if (LLPipeline::RenderUIBuffer) { if (LLView::sIsRectDirty) { |