diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
| commit | c1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch) | |
| tree | 6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/llprimitive/lltextureentry.cpp | |
| parent | d53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff) | |
| parent | d1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff) | |
Merging in main repository.
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; |