diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
| commit | 029130bf9c76139fa836117987b60e801ac7ec7c (patch) | |
| tree | ee320f7737ad3edc74a2401b5bd20a027b670487 /indra/llprimitive/llprimitive.h | |
| parent | 0aac2f674e4bd2fc73025ec8b649739cf7be3e4c (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
| -rw-r--r-- | indra/llprimitive/llprimitive.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 90871fd319..ab1fc4f719 100644 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -68,6 +68,7 @@ extern const F32 OBJECT_REV_MIN; extern const F32 OBJECT_REV_MAX; extern const F32 OBJECT_REV_INC; +extern const char *SCULPT_DEFAULT_TEXTURE; //============================================================================ @@ -79,7 +80,8 @@ public: enum { PARAMS_FLEXIBLE = 0x10, - PARAMS_LIGHT = 0x20 + PARAMS_LIGHT = 0x20, + PARAMS_SCULPT = 0x30 }; public: @@ -206,6 +208,29 @@ public: void copy(const LLNetworkData& data); };// end of attributes structure + + +class LLSculptParams : public LLNetworkData +{ +protected: + LLUUID mSculptTexture; + U8 mSculptType; + +public: + LLSculptParams(); + /*virtual*/ BOOL pack(LLDataPacker &dp) const; + /*virtual*/ BOOL unpack(LLDataPacker &dp); + /*virtual*/ bool operator==(const LLNetworkData& data) const; + /*virtual*/ void copy(const LLNetworkData& data); + + void setSculptTexture(const LLUUID& id) { mSculptTexture = id; } + LLUUID getSculptTexture() { return mSculptTexture; } + void setSculptType(U8 type) { mSculptType = type; } + U8 getSculptType() { return mSculptType; } +}; + + + class LLPrimitive : public LLXform { public: @@ -246,6 +271,7 @@ public: virtual S32 setTEShiny(const U8 te, const U8 shiny); virtual S32 setTEFullbright(const U8 te, const U8 fullbright); virtual S32 setTEMediaFlags(const U8 te, const U8 flags); + virtual S32 setTEGlow(const U8 te, const F32 glow); virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed void setTEArrays(const U8 size, |