Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer

doc/contributions.txt

@@ -1092,6 +1092,7 @@ Nicky Dasmijn
 	SL-10293
 	SL-11061
     SL-11072
+	SL-13141
 Nicky Perian
 	OPEN-1
 	STORM-1087

indra/newview/llviewerobject.cpp

@@ -4953,7 +4953,7 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
 	}
 
 	LLVOAvatar* avatar = getAvatar();
-	if (avatar)
+	if (avatar && isRiggedMesh() && !isHUDAttachment())
 	{
 		LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id);
 		LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex);

indra/newview/llvovolume.cpp

@@ -277,8 +277,10 @@ void LLVOVolume::markDead()
 {
 	if (!mDead)
 	{
-		if( getVolume() ) // <FS:ND/> Check for corrupted volume.
-		LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID());
+        if (getVolume())
+        {
+            LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID());
+        }
 
 		if(getMDCImplCount() > 0)
 		{