From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 12 Aug 2008 17:29:50 +0000 Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated --- indra/newview/llwearable.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llwearable.h') diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index ab9a00c785..ffb360934a 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -61,9 +61,8 @@ enum EWearableType // If you change this, update LLWearable::getTypeName(), get class LLWearable { + friend class LLWearableList; public: - LLWearable(const LLTransactionID& transactionID); - LLWearable(const LLAssetID& assetID); ~LLWearable(); const LLAssetID& getID() { return mAssetID; } @@ -120,6 +119,10 @@ public: friend std::ostream& operator<<(std::ostream &s, const LLWearable &w); private: + // Private constructor used by LLWearableList + LLWearable(const LLTransactionID& transactionID); + LLWearable(const LLAssetID& assetID); + static S32 sCurrentDefinitionVersion; // Depends on the current state of the avatar_lad.xml. S32 mDefinitionVersion; // Depends on the state of the avatar_lad.xml when this asset was created. std::string mName; -- cgit v1.2.3