From 406ff6872f25b6423b642976c009818315b9fcf5 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 10 Mar 2012 20:02:22 -0600
Subject: [PATCH] Removed some pointless console spewage, and resolved a crash
 in avatar picks panel.

---
 indra/newview/llinventorybridge.cpp | 19 -------------------
 indra/newview/llpanelavatar.cpp     | 12 ++++++------
 indra/newview/llvoavatar.cpp        | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 4b5ecbfc4..098fbdf2a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -598,18 +598,6 @@ void hide_context_entries(LLMenuGL& menu,
 	// if the first element is a separator, it will not be shown.
 	bool is_previous_entry_separator = true;
 
-	for (menuentry_vec_t::const_iterator itor = entries_to_show.begin(); itor != entries_to_show.end(); ++itor)
-	{
-		bool found = false;
-		for (LLView::child_list_t::const_iterator itor2 = list->begin(); itor2 != list->end(); ++itor2)
-		{
-			if(*itor == (*itor2)->getName())
-			found = true;
-		}
-		if(!found)
-			llinfos << "Failed to find entry '" << *itor << "'" << llendl;
-	}
-
 	for (LLView::child_list_t::const_iterator itor = list->begin(); 
 		 itor != list->end(); 
 		 ++itor)
@@ -665,7 +653,6 @@ void hide_context_entries(LLMenuGL& menu,
 			{
 				enabled &= (*itor2 != name);
 			}
-			llinfos << (enabled ? "Showing" : "hiding") << " " << menu_item->getName() << llendl;
 			menu_item->setEnabled(enabled);
 		}
 	}
@@ -1942,12 +1929,6 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 			is_movable = FALSE;
 			// tooltip?
 		}
-		// Avoid moves that would change nothing
-		if (is_movable && (mUUID != inv_cat->getParentUUID()))
-		{
-			is_movable = FALSE;
-			// tooltip?
-		}
 		
 		LLInventoryModel::cat_array_t descendent_categories;
 		LLInventoryModel::item_array_t descendent_items;
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 69857de55..5dceed26c 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -713,19 +713,19 @@ void LLPanelAvatarWeb::processProperties(void* data, EAvatarProcessorType type)
 
 BOOL LLPanelAvatarClassified::postBuild(void)
 {
-	childSetAction("New...",onClickNew,NULL);
-	childSetAction("Delete...",onClickDelete,NULL);
+	childSetAction("New...",onClickNew,this);
+	childSetAction("Delete...",onClickDelete,this);
 	return TRUE;
 }
 
 BOOL LLPanelAvatarPicks::postBuild(void)
 {
-	childSetAction("New...",onClickNew,NULL);
-	childSetAction("Delete...",onClickDelete,NULL);
+	childSetAction("New...",onClickNew,this);
+	childSetAction("Delete...",onClickDelete,this);
 	
 	//For pick import and export - RK
-	childSetAction("Import...",onClickImport,NULL);
-	childSetAction("Export...",onClickExport,NULL);
+	childSetAction("Import...",onClickImport,this);
+	childSetAction("Export...",onClickExport,this);
 	return TRUE;
 }
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 6e488346d..6717bd6a9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8343,7 +8343,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 	//	(isTextureDefined(TEX_HAIR_BAKED) ? "HAIR" : "hair " ) << (getTEImage(TEX_HAIR_BAKED)->getID()) << std::endl <<
 	//	(isTextureDefined(TEX_EYES_BAKED)  ? "EYES" : "eyes" ) << (getTEImage(TEX_EYES_BAKED)->getID()) << llendl ;
  
-	if( !mFirstTEMessageReceived )
+	if( !is_first_appearance_message )
 	{
 		onFirstTEMessageReceived();
 	}
@@ -8433,19 +8433,19 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 			}
 		}
 
-		while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
+		const S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
+		if (num_blocks != expected_tweakable_count)
 		{
-			param = getNextVisualParam();
+			llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << ").  Processing what we can.  object: " << getID() << llendl;
+			if(is_first_appearance_message)
+			{
+				while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
+					param = getNextVisualParam();
+				if(param && param->getName() == "breast_physics_mass")
+					llinfos << getFullname() << " does not have avatar physics." << llendl;
+			}
 		}
-		if( param )
-		{
-			if(param->getName() == "breast_physics_mass")
-				llinfos << getFullname() << " does not have avatar physics." << llendl;
-			else
-				llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl;
-			//return; //ASC-TTRFE
-		}
-
+		
 		if (params_changed)
 		{
 			if (interp_params)