diff options
author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/llprimitive/llprimtexturelist.h | |
parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.h')
-rwxr-xr-x | indra/llprimitive/llprimtexturelist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h index 49c636e40f..63e6372405 100755 --- a/indra/llprimitive/llprimtexturelist.h +++ b/indra/llprimitive/llprimtexturelist.h @@ -105,7 +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 setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams, bool isInitFromServer); LLMaterialPtr getMaterialParams(const U8 index); |