summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.h
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-01-28 15:34:10 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-01-28 15:34:10 +0200
commitcdc7229e11ecab9d38a97ddc71c31b0459dd85f6 (patch)
tree4e78b8f8b573ea8fd43780fd7149e9d4854418b9 /indra/llprimitive/llprimitive.h
parent81ecf0c0f304aef72f8b558c732b5ed62acfb946 (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
Merge MAINT-5194 Visual Outfit Browser with Release
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rwxr-xr-xindra/llprimitive/llprimitive.h3
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; }
};