diff options
author | Oz Linden <oz@lindenlab.com> | 2012-09-04 11:08:14 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-09-04 11:08:14 -0400 |
commit | e3b4b3875a6d8c7857ba948a662ace4731913ecf (patch) | |
tree | 8ea52e8470403b101218da6c3cad1634637c7088 /indra/newview/llvovolume.h | |
parent | fa449e17e54de81494d5efbf30f201b7e3371fe0 (diff) | |
parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) |
merge changes for DRTVWR-207
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); |