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