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/llprimtexturelist.cpp | |
| parent | d53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff) | |
| parent | d1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff) | |
Merging in main repository.
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(); |