diff options
| author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
|---|---|---|
| committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
| commit | 97ed20a12bc5b0c0a14534970146425bc854d7fb (patch) | |
| tree | 7071c3750cf0b32c12c0fe32cfaecddcfa6da4f0 /indra/llprimitive/llprimtexturelist.h | |
| parent | 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.h')
| -rwxr-xr-x | indra/llprimitive/llprimtexturelist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h index 3cfa52f1d5..d7fabbbb79 100755 --- a/indra/llprimitive/llprimtexturelist.h +++ b/indra/llprimitive/llprimtexturelist.h @@ -31,9 +31,11 @@ #include "lluuid.h" #include "v3color.h" #include "v4color.h" +#include "llmaterial.h" class LLTextureEntry; +class LLMaterialID; // this is a list of LLTextureEntry*'s because in practice the list's elements // are of some derived class: LLFooTextureEntry @@ -102,6 +104,8 @@ public: S32 setFullbright(const U8 index, const U8 t); 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; |