diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-31 16:28:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-31 16:28:24 -0400 |
| commit | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (patch) | |
| tree | 3fca1895d3b0f8d97d831ccbd79c74f189f7b2dc /indra/newview/llvovolume.h | |
| parent | dab915c1d2a2d08363944de8ac4362fbe162bea0 (diff) | |
| parent | 7f0b247d4b6ce03e92ee3e80e8f7a2027813ea0c (diff) | |
merge changes for
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 8cb69930be..798927a45f 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -174,6 +174,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); |