From 386719b7dd347e43e62c64a63af929d8ce4f7936 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 24 Oct 2016 10:22:14 -0400
Subject: SL-504 - try to prevent an intermittent crash in
 addAttachmentOverridesForObject()

---
 indra/newview/llvoavatar.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview')

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());
-- 
cgit v1.2.3