merge

1 files changed, 36 insertions, 26 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 40ec88f1be..3c141aa37a 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2905,15 +2905,14 @@ protected:
 	// Error
 	/*virtual*/ void httpFailure()
 	{
-		const LLSD& content = getContent();
-		LL_WARNS("Avatar") << "appearance update request failed "
-						   << dumpResponse() << LL_ENDL;
+		LL_WARNS("Avatar") << "appearance update request failed, status "
+						   << getStatus() << " reason " << getReason() << LL_ENDL;
 
 		if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
 		{
+			const LLSD& content = getContent();
 			dumpContents(gAgentAvatarp->getFullname() + "_appearance_request_error", content);
 			debugCOF(content);
-		
 		}
 		onFailure();
 	}
@@ -2947,7 +2946,8 @@ protected:
 
 	void debugCOF(const LLSD& content)
 	{
-		LL_DEBUGS("Avatar") << "AIS COF, version found: " << content["expected"].asInteger() << llendl;
+		LL_INFOS("Avatar") << "AIS COF, version received: " << content["expected"].asInteger()
+						   << " ================================= " << llendl;
 		std::set<LLUUID> ais_items, local_items;
 		const LLSD& cof_raw = content["cof_raw"];
 		for (LLSD::array_const_iterator it = cof_raw.beginArray();
@@ -2959,30 +2959,32 @@ protected:
 				ais_items.insert(item["item_id"].asUUID());
 				if (item["type"].asInteger() == 24) // link
 				{
-					LL_DEBUGS("Avatar") << "Link: item_id: " << item["item_id"].asUUID()
-										<< " linked_item_id: " << item["asset_id"].asUUID()
-										<< " name: " << item["name"].asString()
-										<< llendl; 
+					LL_INFOS("Avatar") << "AIS Link: item_id: " << item["item_id"].asUUID()
+									   << " linked_item_id: " << item["asset_id"].asUUID()
+									   << " name: " << item["name"].asString()
+									   << llendl; 
 				}
 				else if (item["type"].asInteger() == 25) // folder link
 				{
-					LL_DEBUGS("Avatar") << "Folder link: item_id: " << item["item_id"].asUUID()
-										<< " linked_item_id: " << item["asset_id"].asUUID()
-										<< " name: " << item["name"].asString()
-										<< llendl; 
+					LL_INFOS("Avatar") << "AIS Folder link: item_id: " << item["item_id"].asUUID()
+									   << " linked_item_id: " << item["asset_id"].asUUID()
+									   << " name: " << item["name"].asString()
+									   << llendl; 
 					
 				}
 				else
 				{
-					LL_DEBUGS("Avatar") << "Other: item_id: " << item["item_id"].asUUID()
-										<< " linked_item_id: " << item["asset_id"].asUUID()
-										<< " name: " << item["name"].asString()
-										<< llendl; 
+					LL_INFOS("Avatar") << "AIS Other: item_id: " << item["item_id"].asUUID()
+									   << " linked_item_id: " << item["asset_id"].asUUID()
+									   << " name: " << item["name"].asString()
+									   << " type: " << item["type"].asInteger()
+									   << llendl; 
 				}
 			}
 		}
-		LL_DEBUGS("Avatar") << llendl;
-		LL_DEBUGS("Avatar") << "Local COF, version requested: " << content["observed"].asInteger() << llendl;
+		LL_INFOS("Avatar") << llendl;
+		LL_INFOS("Avatar") << "Local COF, version requested: " << content["observed"].asInteger() 
+						   << " ================================= " << llendl;
 		LLInventoryModel::cat_array_t cat_array;
 		LLInventoryModel::item_array_t item_array;
 		gInventory.collectDescendents(LLAppearanceMgr::instance().getCOF(),
@@ -2991,26 +2993,34 @@ protected:
 		{
 			const LLViewerInventoryItem* inv_item = item_array.get(i).get();
 			local_items.insert(inv_item->getUUID());
-			LL_DEBUGS("Avatar") << "item_id: " << inv_item->getUUID()
-								<< " linked_item_id: " << inv_item->getLinkedUUID()
-								<< " name: " << inv_item->getName()
-								<< llendl;
+			LL_INFOS("Avatar") << "LOCAL: item_id: " << inv_item->getUUID()
+							   << " linked_item_id: " << inv_item->getLinkedUUID()
+							   << " name: " << inv_item->getName()
+							   << " parent: " << inv_item->getParentUUID()
+							   << llendl;
 		}
-		LL_DEBUGS("Avatar") << llendl;
+		LL_INFOS("Avatar") << " ================================= " << llendl;
 		for (std::set<LLUUID>::iterator it = local_items.begin(); it != local_items.end(); ++it)
 		{
 			if (ais_items.find(*it) == ais_items.end())
 			{
-				LL_DEBUGS("Avatar") << "LOCAL ONLY: " << *it << llendl;
+				LL_INFOS("Avatar") << "LOCAL ONLY: " << *it << llendl;
 			}
 		}
 		for (std::set<LLUUID>::iterator it = ais_items.begin(); it != ais_items.end(); ++it)
 		{
 			if (local_items.find(*it) == local_items.end())
 			{
-				LL_DEBUGS("Avatar") << "AIS ONLY: " << *it << llendl;
+				LL_INFOS("Avatar") << "AIS ONLY: " << *it << llendl;
 			}
 		}
+		if (local_items.size()==0 && ais_items.size()==0)
+		{
+			LL_INFOS("Avatar") << "COF contents identical, only version numbers differ (req "
+							   << content["observed"].asInteger()
+							   << " rcv " << content["expected"].asInteger()
+							   << ")" << llendl;
+		}
 	}
 
 	LLPointer<LLHTTPRetryPolicy> mRetryPolicy;