From 8f64a9edea9d4230cdc845c126955e23990823cb Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Fri, 2 Mar 2018 02:25:59 -0800
Subject: [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.

---
 indra/newview/llselectmgr.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'indra/newview/llselectmgr.cpp')

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();
+							}
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3


From 485193c7f530fa3d8574c74304e452ab6d012e41 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Fri, 2 Mar 2018 15:29:07 -0800
Subject: [MAINT-8081] - update mesh visibility on tex change

---
 indra/newview/llselectmgr.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'indra/newview/llselectmgr.cpp')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 7b7b81f3e4..1b40c21824 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1648,14 +1648,6 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 				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;
 		}
 	};
@@ -1856,14 +1848,6 @@ BOOL LLSelectMgr::selectionRevertTextures()
 					{
 						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();
-							}
-						}
 					}
 				}
 			}
-- 
cgit v1.2.3


From d0b8617fe6052a94d3a1d06ca44475f05507c770 Mon Sep 17 00:00:00 2001
From: Anchor Linden <anchor@lindenlab.com>
Date: Mon, 26 Mar 2018 05:39:31 -0700
Subject: MAINT-8436,8412,8411,8446,8438: fixed attach/detach

---
 indra/newview/llselectmgr.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llselectmgr.cpp')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 1b40c21824..1eddf92ddf 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -95,6 +95,7 @@
 #include "llviewershadermgr.h"
 #include "llpanelface.h"
 #include "llglheaders.h"
+#include "llinventoryobserver.h"
 
 LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
 //
-- 
cgit v1.2.3