EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release

ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release

1 files changed, 14 insertions, 1 deletions

diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index 186b141ff9..18c99f7453 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -174,7 +174,20 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
 	if (mAttachedObject)
 	{
 		llwarns << "Attempted to attach object where an attachment already exists!" << llendl;
-		return FALSE;
+		
+		if (mAttachedObject == object) {
+			llinfos << "(same object re-attached)" << llendl;
+			removeObject(mAttachedObject);
+			// Pass through anyway to let setupDrawable()
+			// re-connect object to the joint correctly
+		}
+		else {
+			llinfos << "(objects differ, removing existing object)" << llendl;
+			// Rather hacky, but no-one can think of something
+			// better to do for this case.
+			gObjectList.killObject(mAttachedObject);
+			// Proceed with new object attachment
+		}
 	}
 	mAttachedObject = object;