QAR-767 Combined maint-render-7 and maint-viewer-9 merge

merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated

1 files changed, 5 insertions, 2 deletions

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;