summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2012-06-29 10:36:04 -0700
committercallum <none@none>2012-06-29 10:36:04 -0700
commit11686a0917c7e6e67920aca46ade4624c5027c0e (patch)
tree69f56b63cf711b6aef97e0b06d981e5c8087375a /indra/newview/lltoolmorph.cpp
parentfd4708c2c4f221d9f2029072f786e169e119ba1a (diff)
parent326634e1bf9b87e9c9311b67539abb43323bd33c (diff)
Merge with viewer-beta
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);