diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
| commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
| tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/llprimitive/llprimtexturelist.h | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.h')
| -rwxr-xr-x | indra/llprimitive/llprimtexturelist.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h index d7fabbbb79..49c636e40f 100755 --- a/indra/llprimitive/llprimtexturelist.h +++ b/indra/llprimitive/llprimtexturelist.h @@ -107,6 +107,8 @@ public: S32 setMaterialID(const U8 index, const LLMaterialID& pMaterialID); S32 setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams); + LLMaterialPtr getMaterialParams(const U8 index); + S32 size() const; // void forceResize(S32 new_size); |