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/llprimtexturelist.cpp | |
| parent | 0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff) | |
| parent | 132db13fb6bb6dd802d3ee000a10e91127403547 (diff) | |
Merged with viewer-dev-materials
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 20438578b3..c0923315cb 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -369,6 +369,15 @@ S32 LLPrimTextureList::setMaterialID(const U8 index, const LLMaterialID& pMateri return TEM_CHANGE_NONE; } +S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams) +{ + if (index < mEntryList.size()) + { + return mEntryList[index]->setMaterialParams(pMaterialParams); + } + return TEM_CHANGE_NONE; +} + S32 LLPrimTextureList::size() const { return mEntryList.size(); |
