summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
commit3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch)
tree078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/newview/llvovolume.h
parent05a72687d848c13754039f6e720a137827533fdb (diff)
parentc320b4878ae9cd166594285a88437f0d5c333353 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r--indra/newview/llvovolume.h1
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);