diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-16 13:42:20 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-16 13:42:20 -0700 |
| commit | 69e680a37ca9353cd33c058b8984cfc13e7b4ff4 (patch) | |
| tree | 8eeac0ddb5debf053e22f1894172d2afa8af8842 /indra/newview/llvovolume.h | |
| parent | 2dddf959bd4b430510ceb441550cc304c80150c2 (diff) | |
Merge beta fixes
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rwxr-xr-x | indra/newview/llvovolume.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index d1bfefdc70..a5f933c319 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -187,7 +187,7 @@ public: /*virtual*/ S32 setTEMediaFlags(const U8 te, const U8 media_flags); /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*virtual*/ S32 setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID); - void setTEMaterialParamsCallback(const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams); + void setTEMaterialParamsCallback(const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams, U32 te); /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams); /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t); /*virtual*/ S32 setTEScaleS(const U8 te, const F32 s); |