diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
| commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
| tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/newview/llvovolume.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a
QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
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 155775510e..9b4e715194 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -158,12 +158,14 @@ public: /*virtual*/ S32 setTEBumpmap(const U8 te, const U8 bump); /*virtual*/ S32 setTEShiny(const U8 te, const U8 shiny); /*virtual*/ S32 setTEFullbright(const U8 te, const U8 fullbright); + /*virtual*/ S32 setTEBumpShinyFullbright(const U8 te, const U8 bump); /*virtual*/ S32 setTEMediaFlags(const U8 te, const U8 media_flags); /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*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); /*virtual*/ S32 setTETexGen(const U8 te, const U8 texgen); + /*virtual*/ S32 setTEMediaTexGen(const U8 te, const U8 media); /*virtual*/ BOOL setMaterial(const U8 material); void setTexture(const S32 face); |