diff options
author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-17 14:02:31 -0700 |
---|---|---|
committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-17 14:02:31 -0700 |
commit | 74c1bc29e7dc566c7bb1a654b1dbf632d39dcb17 (patch) | |
tree | 266c353919add41bfe9d4079f1339a33dc9a42c0 /indra/newview/llvovolume.h | |
parent | 2a3f4dfc458c42101f048d96b8df68ccd23646be (diff) |
NORSPEC-189 restore old mat param update registration
Diffstat (limited to 'indra/newview/llvovolume.h')
-rwxr-xr-x | indra/newview/llvovolume.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index a5f933c319..52539ab8d5 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -187,7 +187,8 @@ 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, U32 te); + void setTEMaterialParamsCallback(const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams); + void setTEMaterialParamsCallbackTE(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); @@ -382,3 +383,4 @@ protected: }; #endif // LL_LLVOVOLUME_H + |