From adc0aba2dd206e76a41298727794ab80754d439b Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 11 May 2010 15:08:29 -0400 Subject: EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed. --- indra/newview/llwearable.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llwearable.h') diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 7bd5305079..dcc70cbda7 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -68,8 +68,8 @@ public: const LLUUID& getItemID() const; const LLAssetID& getAssetID() const { return mAssetID; } const LLTransactionID& getTransactionID() const { return mTransactionID; } - EWearableType getType() const { return mType; } - void setType(EWearableType type); + LLWearableType::EType getType() const { return mType; } + void setType(LLWearableType::EType type); const std::string& getName() const { return mName; } void setName(const std::string& name) { mName = name; } const std::string& getDescription() const { return mDescription; } @@ -93,7 +93,7 @@ public: void writeToAvatar(); void removeFromAvatar( BOOL upload_bake ) { LLWearable::removeFromAvatar( mType, upload_bake ); } - static void removeFromAvatar( EWearableType type, BOOL upload_bake ); + static void removeFromAvatar( LLWearableType::EType type, BOOL upload_bake ); BOOL exportFile(LLFILE* file) const; BOOL importFile(LLFILE* file); @@ -156,7 +156,7 @@ private: LLSaleInfo mSaleInfo; LLAssetID mAssetID; LLTransactionID mTransactionID; - EWearableType mType; + LLWearableType::EType mType; typedef std::map param_map_t; param_map_t mSavedVisualParamMap; // last saved version of visual params -- cgit v1.2.3 From bf8ee428136b4c38500fb72642d0f75b24057f60 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 11 May 2010 15:24:27 -0400 Subject: EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType Name change LLWearableDictionary.h to LLWearableType.h. --- indra/newview/llwearable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llwearable.h') diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index dcc70cbda7..458415228f 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -38,7 +38,7 @@ #include "llpermissions.h" #include "llsaleinfo.h" #include "llassetstorage.h" -#include "llwearabledictionary.h" +#include "llwearabletype.h" #include "llfile.h" #include "lllocaltextureobject.h" -- cgit v1.2.3