[MAINT 8081] - show/hide avatar base mesh regions if avatar joint attachments are using server bakes. pass the magic ids correctly across ui and texture entry.

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c44aca6fa5..7b7b81f3e4 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1647,6 +1647,15 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 				// * Can just apply the texture and be done with it.
 				objectp->setTEImage(te, LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
 			}
+
+			if (objectp->isAttachment())
+			{
+				LLVOAvatar* avatar = objectp->getAvatar();
+				if (avatar)
+				{
+					avatar->updateMeshVisibility();
+				}
+			}
 			return true;
 		}
 	};
@@ -1846,6 +1855,15 @@ BOOL LLSelectMgr::selectionRevertTextures()
 					else
 					{
 						object->setTEImage(te, LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
+
+						if (object->isAttachment())
+						{
+							LLVOAvatar* avatar = object->getAvatar();
+							if (avatar)
+							{
+								avatar->updateMeshVisibility();
+							}
+						}
 					}
 				}
 			}