diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
| commit | c1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch) | |
| tree | 6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/newview/llvovolume.h | |
| parent | d53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff) | |
| parent | d1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff) | |
Merging in main repository.
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index ff6dca9737..d1bfefdc70 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -187,6 +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); + /*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); /*virtual*/ S32 setTEScaleT(const U8 te, const F32 t); |