diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-06 21:00:50 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-06 21:00:50 +0100 |
| commit | fbd5f63f470e3cea5039b929690c9e28a137c244 (patch) | |
| tree | af6cf39af2aae68460c8d0061ff5e04c2cc50846 /indra/newview/llagent.cpp | |
| parent | c65151b2b34e3dbc95e64bd9f4a358cad2609be4 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index c8d2524e0e..f6d6f7c897 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2036,6 +2036,14 @@ U8 LLAgent::getRenderState() //----------------------------------------------------------------------------- void LLAgent::endAnimationUpdateUI() { + if (LLApp::isExiting() + || !gViewerWindow + || !gMenuBarView + || !gToolBarView + || !gStatusBar) + { + return; + } if (gAgentCamera.getCameraMode() == gAgentCamera.getLastCameraMode()) { // We're already done endAnimationUpdateUI for this transition. |