diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
| commit | 90c26759ef5fe1f35bcda82f444e647d07c28fc6 (patch) | |
| tree | 5f0d669d275be58fa7543cb1a826b3036c031c13 /indra/llprimitive/llprimtexturelist.h | |
| parent | 4d81570d62bc9d746565083ef18fdc16c198a5dc (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
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); |