From 5a7b36d506c8fab720c466a8dff2e3fc79a14390 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 27 Oct 2017 21:29:15 +0300
Subject: [PATCH] MAINT-1114 crash at LLVOAvatar updateGeometry()
---
indra/newview/lltoolmorph.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 2d458db36bb..06a2caf75b3 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -162,8 +162,16 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
// Calling LLCharacter version, as we don't want position/height changes to cause the avatar to jump
// up and down when we're doing preview renders. -Nyx
gAgentAvatarp->LLCharacter::updateVisualParams();
- gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable);
- gAgentAvatarp->updateLOD();
+
+ if (gAgentAvatarp->mDrawable.notNull())
+ {
+ gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable);
+ gAgentAvatarp->updateLOD();
+ }
+ else
+ {
+ LL_WARNS() << "Attempting to update avatar's geometry, but drawable doesn't exist yet" << LL_ENDL;
+ }
LLViewerDynamicTexture::preRender(clear_depth);
}
--
GitLab