diff options
author | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
commit | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (patch) | |
tree | 9a6e74ee503c956dc8f13851f3ff0da712861b08 /indra/newview/llvovolume.h | |
parent | e56145176875a09dc9e1524a47bcc1259582c896 (diff) | |
parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r-- | indra/newview/llvovolume.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 0082f2e991..5482c80f2b 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -173,6 +173,7 @@ public: /*virtual*/ void setScale(const LLVector3 &scale, BOOL damped); + /*virtual*/ void changeTEImage(S32 index, LLViewerTexture* new_image) ; /*virtual*/ void setNumTEs(const U8 num_tes); /*virtual*/ void setTEImage(const U8 te, LLViewerTexture *imagep); /*virtual*/ S32 setTETexture(const U8 te, const LLUUID &uuid); |