diff options
author | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
commit | da68d3a57ecb27eba5d7efb8ff77d9640c0be65e (patch) | |
tree | f2fa2b9ed6e8cf49c8a3cb2a1893c4e5c61916a1 /linden/indra/llprimitive/llprimitive.h | |
parent | Second Life viewer sources 1.15.1.3 (diff) | |
download | meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.zip meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.gz meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.bz2 meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.xz |
Second Life viewer sources 1.16.0.5
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llprimitive/llprimitive.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h index 89e6623..29cd09f 100644 --- a/linden/indra/llprimitive/llprimitive.h +++ b/linden/indra/llprimitive/llprimitive.h | |||
@@ -88,6 +88,7 @@ extern const F32 OBJECT_REV_MIN; | |||
88 | extern const F32 OBJECT_REV_MAX; | 88 | extern const F32 OBJECT_REV_MAX; |
89 | extern const F32 OBJECT_REV_INC; | 89 | extern const F32 OBJECT_REV_INC; |
90 | 90 | ||
91 | extern const char *SCULPT_DEFAULT_TEXTURE; | ||
91 | 92 | ||
92 | //============================================================================ | 93 | //============================================================================ |
93 | 94 | ||
@@ -99,7 +100,8 @@ public: | |||
99 | enum | 100 | enum |
100 | { | 101 | { |
101 | PARAMS_FLEXIBLE = 0x10, | 102 | PARAMS_FLEXIBLE = 0x10, |
102 | PARAMS_LIGHT = 0x20 | 103 | PARAMS_LIGHT = 0x20, |
104 | PARAMS_SCULPT = 0x30 | ||
103 | }; | 105 | }; |
104 | 106 | ||
105 | public: | 107 | public: |
@@ -226,6 +228,29 @@ public: | |||
226 | void copy(const LLNetworkData& data); | 228 | void copy(const LLNetworkData& data); |
227 | };// end of attributes structure | 229 | };// end of attributes structure |
228 | 230 | ||
231 | |||
232 | |||
233 | class LLSculptParams : public LLNetworkData | ||
234 | { | ||
235 | protected: | ||
236 | LLUUID mSculptTexture; | ||
237 | U8 mSculptType; | ||
238 | |||
239 | public: | ||
240 | LLSculptParams(); | ||
241 | /*virtual*/ BOOL pack(LLDataPacker &dp) const; | ||
242 | /*virtual*/ BOOL unpack(LLDataPacker &dp); | ||
243 | /*virtual*/ bool operator==(const LLNetworkData& data) const; | ||
244 | /*virtual*/ void copy(const LLNetworkData& data); | ||
245 | |||
246 | void setSculptTexture(const LLUUID& id) { mSculptTexture = id; } | ||
247 | LLUUID getSculptTexture() { return mSculptTexture; } | ||
248 | void setSculptType(U8 type) { mSculptType = type; } | ||
249 | U8 getSculptType() { return mSculptType; } | ||
250 | }; | ||
251 | |||
252 | |||
253 | |||
229 | class LLPrimitive : public LLXform | 254 | class LLPrimitive : public LLXform |
230 | { | 255 | { |
231 | public: | 256 | public: |
@@ -266,6 +291,7 @@ public: | |||
266 | virtual S32 setTEShiny(const U8 te, const U8 shiny); | 291 | virtual S32 setTEShiny(const U8 te, const U8 shiny); |
267 | virtual S32 setTEFullbright(const U8 te, const U8 fullbright); | 292 | virtual S32 setTEFullbright(const U8 te, const U8 fullbright); |
268 | virtual S32 setTEMediaFlags(const U8 te, const U8 flags); | 293 | virtual S32 setTEMediaFlags(const U8 te, const U8 flags); |
294 | virtual S32 setTEGlow(const U8 te, const F32 glow); | ||
269 | virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed | 295 | virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed |
270 | 296 | ||
271 | void setTEArrays(const U8 size, | 297 | void setTEArrays(const U8 size, |