diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
| commit | d149aea87c3214ea9510ea43a7e23e03cdcb27e6 (patch) | |
| tree | fbda1184d646a86b63d5496fe64e9a7659788f1d /indra/llprimitive/lltextureentry.cpp | |
| parent | 0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff) | |
| parent | 132db13fb6bb6dd802d3ee000a10e91127403547 (diff) | |
Merged with viewer-dev-materials
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 10 |
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; |