summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.h
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-15 00:23:36 +0200
committerNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-15 00:23:36 +0200
commit49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch)
tree2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/llprimitive/llprimitive.h
parent079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff)
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
Merge
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rwxr-xr-xindra/llprimitive/llprimitive.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index cdb3f273c2..1bf83e36b4 100755
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -389,6 +389,8 @@ public:
virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed
virtual void setTESelected(const U8 te, bool sel);
+ LLMaterialPtr getTEMaterialParams(const U8 index);
+
void copyTEs(const LLPrimitive *primitive);
S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const;
S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type);