Cleanup of llappearance refactor file definition order for easier diff'ing

9 files changed, 6 insertions, 42 deletions

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 1ca0161d7e..044ea8fbf0 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -38,7 +38,6 @@ LLAvatarAppearance::LLAvatarAppearance() :
 	mTexEyeColor( NULL ),
 	mIsDummy(FALSE)
 {
-	mDebugExistenceTimer.reset();
 }
 
 using namespace LLVOAvatarDefines;
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index cb2ae7aeef..1b0e0ad270 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -111,15 +111,6 @@ public:
 
 	virtual BOOL			isWearingWearableType(LLWearableType::EType type ) const = 0;
 
-	//--------------------------------------------------------------------
-	// Avatar Rez Metrics
-	//--------------------------------------------------------------------
-public:
-	F32				debugGetExistenceTimeElapsedF32() const { return mDebugExistenceTimer.getElapsedTimeF32(); }
-
-protected:
-	LLFrameTimer	mDebugExistenceTimer; // Debugging for how long the avatar has been in memory.
-
 public:
 	static LLColor4 getDummyColor();
 	virtual void	updateMeshTextures() = 0;
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 3bb31d3721..6522976be1 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -33,20 +33,13 @@
 #include "imageids.h"
 #include "llimagej2c.h"
 #include "llimagetga.h"
-//#include "llnotificationsutil.h"
 #include "lldir.h"
 #include "llvfile.h"
 #include "llvfs.h"
-//#include "llviewerstats.h"
-//#include "llviewerregion.h"
-//#include "pipeline.h"
 #include "lltexlayerparams.h"
 #include "lltexturemanagerbridge.h"
 #include "llui.h"
-//#include "llagentwearables.h"
 #include "llwearable.h"
-//#include "llviewercontrol.h"
-//#include "llviewershadermgr.h"
 #include "llviewervisualparam.h"
 
 //#include "../tools/imdebug/imdebug.h"
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index c843367357..4f0456f315 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -29,7 +29,6 @@
 #include "lltexlayerparams.h"
 
 #include "llavatarappearance.h"
-//#include "llagentcamera.h"
 #include "llimagetga.h"
 #include "llquantize.h"
 #include "lltexlayer.h"
diff --git a/indra/llappearance/llvoavatardefines.cpp b/indra/llappearance/llvoavatardefines.cpp
index 48ef63ab64..29891986f5 100644
--- a/indra/llappearance/llvoavatardefines.cpp
+++ b/indra/llappearance/llvoavatardefines.cpp
@@ -24,11 +24,8 @@
  * $/LicenseInfo$
  */
 
-//#include "llviewerprecompiledheaders.h"
 #include "linden_common.h"
-
 #include "llvoavatardefines.h"
-//#include "llviewercontrol.h" // gSavedSettings
 
 const S32 LLVOAvatarDefines::SCRATCH_TEX_WIDTH = 512;
 const S32 LLVOAvatarDefines::SCRATCH_TEX_HEIGHT = 512;
diff --git a/indra/llappearance/llvoavatardefines.h b/indra/llappearance/llvoavatardefines.h
index 7b0442bffb..7745775f9f 100644
--- a/indra/llappearance/llvoavatardefines.h
+++ b/indra/llappearance/llvoavatardefines.h
@@ -29,8 +29,8 @@
 #define LLVOAVATAR_DEFINES_H
 
 #include <vector>
-#include "lljointpickname.h"
 #include "llwearable.h"
+#include "lljointpickname.h"
 #include "lldictionary.h"
 
 namespace LLVOAvatarDefines
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index 64bd921ec5..77f1f27cb0 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -27,24 +27,12 @@
 #include "linden_common.h"
 
 #include "llavatarappearance.h"
-//#include "llagentwearables.h"
-//#include "lldictionary.h"
-//#include "llfloatersidepanelcontainer.h"
 #include "lllocaltextureobject.h"
-//#include "llnotificationsutil.h"
-//#include "llviewertexturelist.h"
-//#include "llinventorymodel.h"
-//#include "llinventoryobserver.h"
-//#include "llsidepanelappearance.h"
 #include "lltexlayer.h"
-//#include "lltexglobalcolor.h"
 #include "lltexturemanagerbridge.h"
-//#include "lltrans.h"
-//#include "llviewerregion.h"
 #include "llvisualparam.h"
 #include "llvoavatardefines.h"
 #include "llwearable.h"
-//#include "llviewercontrol.h"
 
 using namespace LLVOAvatarDefines;
 
@@ -170,6 +158,7 @@ LLWearable::EImportResult LLWearable::importFile( LLFILE* file )
 		return LLWearable::BAD_HEADER;
 	}
 
+
 	// Temporary hack to allow wearables with definition version 24 to still load.
 	// This should only affect lindens and NDA'd testers who have saved wearables in 2.0
 	// the extra check for version == 24 can be removed before release, once internal testers
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;
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index d47702ff4d..009a3b631a 100644
--- a/indra/llappearance/llwearabletype.cpp
+++ b/indra/llappearance/llwearabletype.cpp
@@ -24,11 +24,9 @@
  * $/LicenseInfo$
  */
 
-//#include "llviewerprecompiledheaders.h"
 #include "linden_common.h"
  
 #include "llwearabletype.h"
-//#include "llinventoryfunctions.h"
 #include "llinventoryicon.h"
 #include "lltrans.h"