2 files changed, 12 insertions, 5 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index ebdbc53..c44fe3a 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -458,8 +458,15 @@ void LLAgent::init()
 //-----------------------------------------------------------------------------
 void LLAgent::cleanup()
 {
-        mInitialized = FALSE;
+        // cleanup wearables
+        for( S32 i = 0; i < WT_COUNT; i++ )
+        {
+                mWearableEntry[ i ].mWearable = NULL;
+                mWearableEntry[ i ].mItemID.setNull();
+        }
         mWearablesLoaded = FALSE;
+
+        mInitialized = FALSE;
         mShowAvatar = TRUE;
 
         setSitCamera(LLUUID::null);
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 954321f..7952bae 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -223,7 +223,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 // Creates a new wearable just like the old_wearable but with data copied over from item
 LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item )
 {
-        lldebugs << "LLWearableList::createWearableMatchedToInventoryItem()" << llendl;
+        LL_DEBUGS("Wearable") << "LLWearableList::createWearableMatchedToInventoryItem()" << LL_ENDL;
 
         LLTransactionID tid;
         LLAssetID new_asset_id;
@@ -247,7 +247,7 @@ LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* ol
 
 LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name )
 {
-        lldebugs << "LLWearableList::createCopyFromAvatar()" << llendl;
+        LL_DEBUGS("Wearable") << "LLWearableList::createCopyFromAvatar()" << LL_ENDL;
 
         LLTransactionID tid;
         LLAssetID new_asset_id;
@@ -274,7 +274,7 @@ LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, cons
 
 LLWearable* LLWearableList::createCopy( LLWearable* old_wearable )
 {
-        lldebugs << "LLWearableList::createCopy()" << llendl;
+        LL_DEBUGS("Wearable") << "LLWearableList::createCopy()" << LL_ENDL;
 
         LLTransactionID tid;
         LLAssetID new_asset_id;
@@ -296,7 +296,7 @@ LLWearable* LLWearableList::createCopy( LLWearable* old_wearable )
 
 LLWearable* LLWearableList::createNewWearable( EWearableType type )
 {
-        lldebugs << "LLWearableList::createNewWearable()" << llendl;
+        LL_DEBUGS("Wearable") << "LLWearableList::createNewWearable()" << LL_ENDL;
 
         LLTransactionID tid;
         LLAssetID new_asset_id;