summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.h
diff options
context:
space:
mode:
authorBradley Payne <vir@lindenlab.com>2009-10-12 18:40:11 +0000
committerBradley Payne <vir@lindenlab.com>2009-10-12 18:40:11 +0000
commit3bd6c1919cc3a142a112278a6dc83bd8292bcb5a (patch)
tree6ea3178f5aa587d6d2e445b6cf17f25a6127833b /indra/newview/llwearable.h
parent45a375c3feb3027d7a329ac1beb97fa30759dcfe (diff)
Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
Diffstat (limited to 'indra/newview/llwearable.h')
-rw-r--r--indra/newview/llwearable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index 5f0b235c7f..d7b4d3f91e 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -62,6 +62,7 @@ public:
// Accessors
//--------------------------------------------------------------------
public:
+ const LLUUID& getItemID() const;
const LLAssetID& getAssetID() const { return mAssetID; }
const LLTransactionID& getTransactionID() const { return mTransactionID; }
EWearableType getType() const { return mType; }
@@ -77,6 +78,7 @@ public:
const std::string& getTypeLabel() const;
const std::string& getTypeName() const;
LLAssetType::EType getAssetType() const;
+ LLLocalTextureObject* getLocalTextureObject(S32 index) const;
public:
BOOL isDirty() const;
@@ -102,8 +104,6 @@ public:
friend std::ostream& operator<<(std::ostream &s, const LLWearable &w);
void setItemID(const LLUUID& item_id);
- const LLUUID& getItemID() const;
- LLLocalTextureObject* getLocalTextureObject(S32 index) const;
void setLocalTextureObject(S32 index, LLLocalTextureObject *lto);
private: