diff options
author | Don Kjer <don@lindenlab.com> | 2012-09-03 08:37:58 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-09-03 08:37:58 +0000 |
commit | 0c7623f628cbba999860379a2f5c302d94c1d287 (patch) | |
tree | 0f00c5f444c85575b09043b473e0c551faa7bddc /indra/llappearance/llwearable.h | |
parent | 1bd5fd8c50eb299ea96720db8cf0f9b25ec6e941 (diff) |
Cleanup of llappearance refactor file definition order for easier diff'ing
Diffstat (limited to 'indra/llappearance/llwearable.h')
-rw-r--r-- | indra/llappearance/llwearable.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h index 56c931e43b..8a99debac8 100644 --- a/indra/llappearance/llwearable.h +++ b/indra/llappearance/llwearable.h @@ -28,19 +28,16 @@ #define LL_LLWEARABLE_H #include "llextendedstatus.h" -//#include "lluuid.h" -//#include "llstring.h" #include "llpermissions.h" #include "llsaleinfo.h" -//#include "llassetstorage.h" #include "llwearabletype.h" -//#include "llfile.h" #include "lllocaltextureobject.h" class LLVisualParam; class LLTexGlobalColorInfo; class LLTexGlobalColor; +// Abstract class. class LLWearable { //-------------------------------------------------------------------- @@ -72,6 +69,8 @@ public: public: typedef std::vector<LLVisualParam*> visual_param_vec_t; + virtual void writeToAvatar() = 0; + enum EImportResult { FAILURE = 0, @@ -81,12 +80,11 @@ public: virtual BOOL exportFile(LLFILE* file) const; virtual EImportResult importFile(LLFILE* file); - virtual LLLocalTextureObject* getLocalTextureObject(S32 index) = 0; - virtual void writeToAvatar() = 0; static void setCurrentDefinitionVersion( S32 version ) { LLWearable::sCurrentDefinitionVersion = version; } + virtual LLLocalTextureObject* getLocalTextureObject(S32 index) = 0; void addVisualParam(LLVisualParam *param); void setVisualParamWeight(S32 index, F32 value, BOOL upload_bake); F32 getVisualParamWeight(S32 index) const; |