From d9e8ee7cfd323872145c23e4032989f9b7770f55 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Mon, 13 May 2013 13:02:53 -0700
Subject: NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more
 consistent and increased max range on repeats per meter

---
 indra/llprimitive/lltextureentry.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'indra/llprimitive/lltextureentry.cpp')

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 597f078490..ca57f1edbd 100755
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -539,28 +539,21 @@ S32 LLTextureEntry::setGlow(F32 glow)
 
 S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID)
 {
-	if ( (mMaterialID != pMaterialID) || (mMaterialUpdatePending && !mSelected) )
+	if (mMaterialID != pMaterialID)
 	{
-		if (mSelected)
+		mMaterialID = pMaterialID;
+		
+	}
+	if (mMaterialID.isNull())
 		{
-			mMaterialUpdatePending = true;
-			mMaterialID = pMaterialID;
-			return TEM_CHANGE_NONE;
+		setMaterialParams(NULL);
 		}
-
-		mMaterialUpdatePending = false;
-		mMaterialID = pMaterialID;
 		return TEM_CHANGE_TEXTURE;
 	}
-	return TEM_CHANGE_NONE;
-}
 
 S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams)
 {
-	if (mSelected)
-	{
-		mMaterialUpdatePending = true;
-	}
+
 	mMaterial = pMaterialParams;
 	return TEM_CHANGE_TEXTURE;
 }
-- 
cgit v1.2.3