diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-01-28 15:34:10 +0200 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-01-28 15:34:10 +0200 |
commit | cdc7229e11ecab9d38a97ddc71c31b0459dd85f6 (patch) | |
tree | 4e78b8f8b573ea8fd43780fd7149e9d4854418b9 /indra/llprimitive/llprimitive.h | |
parent | 81ecf0c0f304aef72f8b558c732b5ed62acfb946 (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
Merge MAINT-5194 Visual Outfit Browser with Release
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rwxr-xr-x | indra/llprimitive/llprimitive.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 1bf83e36b4..19d9d52817 100755 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -259,9 +259,8 @@ public: operator LLSD() const { return asLLSD(); } bool fromLLSD(LLSD& sd); - void setSculptTexture(const LLUUID& id) { mSculptTexture = id; } + void setSculptTexture(const LLUUID& texture_id, U8 sculpt_type); LLUUID getSculptTexture() const { return mSculptTexture; } - void setSculptType(U8 type) { mSculptType = type; } U8 getSculptType() const { return mSculptType; } }; |