summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-10-24 10:22:14 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-10-24 10:22:14 -0400
commit386719b7dd347e43e62c64a63af929d8ce4f7936 (patch)
treef0cc8126d1dcde16948da3d3d9b465ac3ade2572 /indra/newview
parentfd226196319909af8f99f6fbed04bb7713975f02 (diff)
SL-504 - try to prevent an intermittent crash in addAttachmentOverridesForObject()
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoavatar.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 46c367b4e6..b68a7774a5 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5522,6 +5522,7 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
if (!av || (av != this))
{
LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
+ return;
}
LLScopedContextString str("addAttachmentOverridesForObject " + av->getFullname());