diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-10-27 21:29:15 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-10-27 21:29:15 +0300 |
| commit | 5a7b36d506c8fab720c466a8dff2e3fc79a14390 (patch) | |
| tree | 07093154d0c88abb6fc6a321aae0bf682ac863a2 /indra | |
| parent | d7732280a913cf2200d04eb3d0c549c44e78cc44 (diff) | |
MAINT-1114 crash at LLVOAvatar updateGeometry()
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltoolmorph.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 2d458db36b..06a2caf75b 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); } |