From 5ac9d9cb05f22099bea8c9312f5e0b234430022a Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 12 May 2013 16:10:31 +0200
Subject: LLMaterialMgr::get() doesn't handle a callback request for
 LLMaterialID::null

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

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 8365c9d7b6..597f078490 100755
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -550,12 +550,9 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID)
 
 		mMaterialUpdatePending = false;
 		mMaterialID = pMaterialID;
+		return TEM_CHANGE_TEXTURE;
 	}
-	if (mMaterialID.isNull())
-	{
-		setMaterialParams(NULL);
-	}
-	return TEM_CHANGE_TEXTURE;
+	return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams)
-- 
cgit v1.2.3