summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lltextureentry.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
committerGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
commit5f03e197f4cfb43de93dc42b16b54beafccd376a (patch)
tree77fe17e9c36021148c18f7f9f33aae5abcd100c0 /indra/llprimitive/lltextureentry.cpp
parentcc7ae8fbd1fc249f77ced95171e5c22e48adedb6 (diff)
Trying to set materials up for rendering! Yay!
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
-rw-r--r--indra/llprimitive/lltextureentry.cpp10
1 files changed, 10 insertions, 0 deletions
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;