diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
| commit | 95fc2d48eced78b2aaa29b9e8b3f9410eed1ad8c (patch) | |
| tree | 7748f0142e0ecbc91daa33c42a679799c4375d5e /indra/llprimitive/llprimitive.h | |
| parent | 96d16928600dbf3666221a19575af9330840cfd5 (diff) | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
merge changes for 3.7.30-release
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
| -rwxr-xr-x | indra/llprimitive/llprimitive.h | 2 |
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); |