summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
committerDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
commit99dc246ac843114f20f7aa99531451fcf46df3ed (patch)
treed94a0a31e00c53ea359d9939d1928180d398b334 /indra/newview/lltoolmorph.cpp
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
parentd76715776bb9e26577c4e505745eb2773e8a4796 (diff)
Merge
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 718201e381..0d5daf129f 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -225,7 +225,8 @@ BOOL LLVisualParamHint::render()
LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight, FALSE);
- if (gAgentAvatarp->mDrawable.notNull())
+ if (gAgentAvatarp->mDrawable.notNull() &&
+ gAgentAvatarp->mDrawable->getFace(0))
{
LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)gAgentAvatarp->mDrawable->getFace(0)->getPool();
LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);