diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-04 09:38:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-04 09:38:06 -0500 |
| commit | 68ec77127b158f0abffb6160eb7d870c85b278ad (patch) | |
| tree | ad43a05bb4a45449d27f4c077ef8ca653f35d7b9 /indra/llprimitive/llprimtexturelist.h | |
| parent | 19233999edfd143d0e7f8e3743dc07455d206172 (diff) | |
| parent | 7cc7ae873c5aeca9b5939176fb70677365e25395 (diff) | |
merge tonyas loop fixes
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.h')
| -rw-r--r-- | 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 691df44c18..d7fabbbb79 100644 --- a/indra/llprimitive/llprimtexturelist.h +++ b/indra/llprimitive/llprimtexturelist.h @@ -31,6 +31,7 @@ #include "lluuid.h" #include "v3color.h" #include "v4color.h" +#include "llmaterial.h" class LLTextureEntry; @@ -104,6 +105,7 @@ public: S32 setMediaFlags(const U8 index, const U8 media_flags); S32 setGlow(const U8 index, const F32 glow); S32 setMaterialID(const U8 index, const LLMaterialID& pMaterialID); + S32 setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams); S32 size() const; |