diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
| commit | 1dd7e76908277f0ad4b24a8e320aa2b9f9321048 (patch) | |
| tree | c9ca7fd71fdf533c7f500828e1e708dc5d7af5ac /indra/llprimitive/llprimtexturelist.cpp | |
| parent | 3e0483df17181269c4cada7ad5585201f442598c (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge with viewer-release and become 3.7.28
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rwxr-xr-x | indra/llprimitive/llprimtexturelist.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index dfae9699ec..f4f08248b8 100755 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -377,6 +377,16 @@ S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMa return TEM_CHANGE_NONE; } +LLMaterialPtr LLPrimTextureList::getMaterialParams(const U8 index) +{ + if (index < mEntryList.size()) + { + return mEntryList[index]->getMaterialParams(); + } + + return LLMaterialPtr(); +} + S32 LLPrimTextureList::size() const { return mEntryList.size(); |