4 files changed, 12 insertions, 3 deletions
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index f77c7e6440..0206f76546 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -4,7 +4,6 @@ project(llappearance)
 
 include(00-Common)
 include(LLCommon)
-include(Viewer)
 include(LLAudio)
 include(LLCharacter)
 include(LLCommon)
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 2cc38ae2ab..75b9c1ffa5 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llavatarappearance.h"
+#include "lldeleteutils.h"
 #include "lltexglobalcolor.h"
 
 const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0);
@@ -40,6 +41,14 @@ LLAvatarAppearance::LLAvatarAppearance() :
 {
 }
 
+// virtual
+LLAvatarAppearance::~LLAvatarAppearance()
+{
+	deleteAndClear(mTexSkinColor);
+	deleteAndClear(mTexHairColor);
+	deleteAndClear(mTexEyeColor);
+}
+
 using namespace LLAvatarAppearanceDefines;
 
 //static
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index e882868e91..0e746b3b9d 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -28,7 +28,7 @@
 #define LL_AVATAR_APPEARANCE_H
 
 #include "llcharacter.h"
-#include "llframetimer.h"
+//#include "llframetimer.h"
 #include "llavatarappearancedefines.h"
 
 class LLTexLayerSet;
@@ -50,6 +50,7 @@ class LLAvatarAppearance : public LLCharacter
 
 public:
 	LLAvatarAppearance();
+	virtual ~LLAvatarAppearance();
 
 /**                    Initialization
  **                                                                            **
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index e9e1764763..e6c2ece64a 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -29,7 +29,7 @@
 
 #include <deque>
 #include "llgltexture.h"
-#include "llframetimer.h"
+//#include "llframetimer.h"
 #include "llavatarappearancedefines.h"
 #include "lltexlayerparams.h"