MAINT-8438,8446: fix bakes on child prims

4 files changed, 47 insertions, 91 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index d9170dd832..97876dd60a 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1011,7 +1011,7 @@ void LLFloaterTexturePicker::onBakeTextureSelect(LLUICtrl* ctrl, void *user_data
 	else
 	{
 		self->setCanApply(true, true);
-		self->setImageID(self->mOriginalImageAssetID);
+		self->setImageID(self->mDefaultImageAssetID);
 		self->commitIfImmediateSet();
 	}
 }
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 15d7ac7ad4..37e6fa080a 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4368,11 +4368,6 @@ void LLViewerObject::sendTEUpdate() const
 
 LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
 {
-	if (!isAttachment())
-	{
-		return NULL;
-	}
-
 	if (!LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(id))
 	{
 		return NULL;
@@ -4382,7 +4377,19 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
 	if (avatar)
 	{
 		LLAvatarAppearanceDefines::ETextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::bakedToLocalTextureIndex(LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id));
-		return avatar->getBakedTextureImage(texIndex, avatar->getTE(texIndex)->getID());
+		LLViewerTexture* bakedTexture = avatar->getBakedTextureImage(texIndex, avatar->getTE(texIndex)->getID());
+		if (bakedTexture == NULL || bakedTexture->isMissingAsset())
+		{
+			return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+		}
+		else
+		{
+			return bakedTexture;
+		}
+	}
+	else
+	{
+		return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
 	}
 
 	return NULL;
@@ -4434,6 +4441,20 @@ void LLViewerObject::setTE(const U8 te, const LLTextureEntry &texture_entry)
 	}
 }
 
+void LLViewerObject::refreshBakeTexture()
+{
+	for (int face_index = 0; face_index < getNumTEs(); face_index++)
+	{
+		LLTextureEntry* tex_entry = getTE(face_index);
+		if (tex_entry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(tex_entry->getID()))
+		{
+			const LLUUID& image_id = tex_entry->getID();
+			LLViewerTexture* bakedTexture = getBakedTextureForMagicId(image_id);
+			changeTEImage(face_index, bakedTexture);
+		}
+	}
+}
+
 void LLViewerObject::setTEImage(const U8 te, LLViewerTexture *imagep)
 {
 	if (mTEImages[te] != imagep)
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index e6ed7d2fd5..a9035c71e1 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -571,6 +571,7 @@ public:
 public:
 	LLViewerTexture* getBakedTextureForMagicId(const LLUUID& id);
 	void updateAvatarMeshVisibility(const LLUUID& id, const LLUUID& old_id);
+	void refreshBakeTexture();
 public:
 	static void unpackVector3(LLDataPackerBinaryBuffer* dp, LLVector3& value, std::string name);
 	static void unpackUUID(LLDataPackerBinaryBuffer* dp, LLUUID& value, std::string name);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index f61f0b7cc6..c6a8afe92d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6430,22 +6430,8 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o
 		LLSelectMgr::getInstance()->updatePointAt();
 	}
 
-	const U32 MAX_TES = 32;
+	viewer_object->refreshBakeTexture();
 
-	S32 last_face_index = llmin((U32)viewer_object->getNumTEs(), MAX_TES) - 1;
-
-	if (last_face_index > -1)
-	{
-		S8 face_index;
-		for (face_index = 0; face_index <= last_face_index; face_index++)
-		{
-			LLTextureEntry* texEntry = viewer_object->getTE(face_index);
-			if (texEntry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texEntry->getID()))
-			{
-				viewer_object->setTEImage(face_index, viewer_object->getBakedTextureForMagicId(texEntry->getID()));
-			}
-		}
-	}
 
 	LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
 	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
@@ -6454,18 +6440,10 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o
 		LLViewerObject* objectp = *iter;
 		if (objectp)
 		{
-			for (int face_index = 0; face_index < objectp->getNumTEs(); face_index++)
-			{
-				LLTextureEntry* tex_entry = objectp->getTE(face_index);
-				if (tex_entry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(tex_entry->getID()))
-				{
-					objectp->setTEImage(face_index, viewer_object->getBakedTextureForMagicId(tex_entry->getID()));
-				}
-			}
+			objectp->refreshBakeTexture();
 		}
 	}
 
-
 	updateMeshVisibility();
 
 	return attachment;
@@ -6619,39 +6597,16 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
 			cleanupAttachedMesh(viewer_object);
 
 			attachment->removeObject(viewer_object);
-
-			const U32 MAX_TES = 32;
-
-			S32 last_face_index = llmin((U32)viewer_object->getNumTEs(), MAX_TES) - 1;
-
-			if (last_face_index > -1)
-			{
-				S8 face_index;
-				for (face_index = 0; face_index <= last_face_index; face_index++)
-				{
-					LLTextureEntry* texEntry = viewer_object->getTE(face_index);
-					if (texEntry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texEntry->getID()))
-					{
-						viewer_object->setTEImage(face_index, LLViewerTextureManager::getFetchedTexture(texEntry->getID(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
-					}
-				}
-			}
-
+			viewer_object->refreshBakeTexture();
+			
 			LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
-			for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
-				iter != child_list.end(); ++iter)
+			for (LLViewerObject::child_list_t::const_iterator iter1 = child_list.begin();
+				iter1 != child_list.end(); ++iter1)
 			{
-				LLViewerObject* objectp = *iter;
+				LLViewerObject* objectp = *iter1;
 				if (objectp)
 				{
-					for (int face_index = 0; face_index < objectp->getNumTEs(); face_index++)
-					{
-						LLTextureEntry* texEntry = viewer_object->getTE(face_index);
-						if (texEntry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texEntry->getID()))
-						{
-							objectp->setTEImage(face_index, LLViewerTextureManager::getFetchedTexture(texEntry->getID(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
-						}
-					}
+					objectp->refreshBakeTexture();
 				}
 			}
 
@@ -7309,15 +7264,15 @@ void LLVOAvatar::updateMeshVisibility()
 				}
 
 				LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
-				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
-					iter != child_list.end(); ++iter)
+				for (LLViewerObject::child_list_t::const_iterator iter1 = child_list.begin();
+					iter1 != child_list.end(); ++iter1)
 				{
-					LLViewerObject* objectp = *iter;
-					if (objectp)
+					LLViewerObject* objectchild = *iter1;
+					if (objectchild)
 					{
-						for (int face_index = 0; face_index < objectp->getNumTEs(); face_index++)
+						for (int face_index = 0; face_index < objectchild->getNumTEs(); face_index++)
 						{
-							LLTextureEntry* tex_entry = objectp->getTE(face_index);
+							LLTextureEntry* tex_entry = objectchild->getTE(face_index);
 							bake_flag[BAKED_HEAD] |= (tex_entry->getID() == IMG_USE_BAKED_HEAD);
 							bake_flag[BAKED_EYES] |= (tex_entry->getID() == IMG_USE_BAKED_EYES);
 							bake_flag[BAKED_HAIR] |= (tex_entry->getID() == IMG_USE_BAKED_HAIR);
@@ -7331,6 +7286,8 @@ void LLVOAvatar::updateMeshVisibility()
 		}
 	}
 
+	LL_INFOS() << "head " << bake_flag[BAKED_HEAD] << "eyes " << bake_flag[BAKED_EYES] << "hair " << bake_flag[BAKED_HAIR] << "lower " << bake_flag[BAKED_LOWER] << "upper " << bake_flag[BAKED_UPPER] << "skirt " << bake_flag[BAKED_SKIRT] << LL_ENDL;
+
 	for (S32 i = 0; i < mMeshLOD.size(); i++)
 	{
 		LLAvatarJoint* joint = mMeshLOD[i];
@@ -8378,23 +8335,7 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte
 			++attachment_iter)
 		{
 			LLViewerObject* attached_object = (*attachment_iter);
-
-			const U32 MAX_TES = 32;
-
-			S32 last_face_index = llmin((U32)attached_object->getNumTEs(), MAX_TES) - 1;
-
-			if (last_face_index > -1)
-			{
-				S8 face_index;
-				for (face_index = 0; face_index <= last_face_index; face_index++)
-				{
-					LLTextureEntry* texEntry = attached_object->getTE(face_index);
-					if (texEntry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texEntry->getID()))
-					{
-						attached_object->setTEImage(face_index, LLViewerTextureManager::getFetchedTexture(texEntry->getID(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
-					}
-				}
-			}
+			attached_object->refreshBakeTexture();
 
 			LLViewerObject::const_child_list_t& child_list = attached_object->getChildren();
 			for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
@@ -8403,14 +8344,7 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte
 				LLViewerObject* objectp = *iter;
 				if (objectp)
 				{
-					for (int face_index = 0; face_index < objectp->getNumTEs(); face_index++)
-					{
-						LLTextureEntry* texEntry = objectp->getTE(face_index);
-						if (texEntry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texEntry->getID()))
-						{
-							objectp->setTEImage(face_index, LLViewerTextureManager::getFetchedTexture(texEntry->getID(), FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
-						}
-					}
+					objectp->refreshBakeTexture();
 				}
 			}
 		}