diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
| commit | cabbc19e95707400a7632498296cc1012b34bb0f (patch) | |
| tree | 00a1fc15e9fd2c2ee742951967cf37eff22ee47a /indra/newview/llagent.cpp | |
| parent | 7bf2a1f5fef557e4531731c608c8dd924c97bc39 (diff) | |
| parent | 7449f4b6d770be9d56ee5fa3d20b6b59d816719c (diff) | |
DRTVWR-510: Fix merge conflict
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. |