From f189ba4a3d927fe0ecfb83b36b60a47c88525fdd Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 3 Apr 2013 16:56:59 -0500
Subject: NORSPEC-71 Lots more UI hookups

Written with and Reviewed By Graham
---
 indra/llprimitive/lltextureentry.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 23b15b697c..691216e035 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -535,6 +535,10 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID)
 	if (mMaterialID != pMaterialID)
 	{
 		mMaterialID = pMaterialID;
+		if (mMaterialID.isNull())
+		{
+			setMaterialParams(NULL);
+		}
 		return TEM_CHANGE_TEXTURE;
 	}
 	return TEM_CHANGE_NONE;
-- 
cgit v1.2.3