From 5f03e197f4cfb43de93dc42b16b54beafccd376a Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Fri, 25 Jan 2013 17:54:38 -0500
Subject: Trying to set materials up for rendering! Yay!

---
 indra/llprimitive/lltextureentry.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index b04fa809d2..23b15b697c 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -540,6 +540,16 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID)
 	return TEM_CHANGE_NONE;
 }
 
+S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams)
+{
+	if (mMaterial != pMaterialParams)
+	{
+		mMaterial = pMaterialParams;
+		return TEM_CHANGE_TEXTURE;
+	}
+	return TEM_CHANGE_NONE;
+}
+
 void LLTextureEntry::setMediaData(const LLMediaEntry &media_entry)
 {
     mMediaFlags |= MF_HAS_MEDIA;
-- 
cgit v1.2.3