Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213

indra/newview/llviewerobject.cpp

@@ -1547,6 +1547,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 				
 				if (sent_parentp && (sent_parentp != this) && !sent_parentp->isDead())
 				{
+					if (((LLViewerObject*)sent_parentp)->isAvatar())
+					{
+						//LL_DEBUGS("Avatar") << "ATT got object update for attachment " << LL_ENDL;
+					}
+
 					//
 					// We have a viewer object for the parent, and it's not dead.
 					// Do the actual reparenting here.