From 1f2404aa29249f94ec987a0fe9e9cc5fa1cd634b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 18 Feb 2015 16:44:36 -0500
Subject: Logging for attachments and their COF links

---
 indra/newview/llattachmentsmgr.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 256980eb04..d7c4a24fb5 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -60,6 +60,8 @@ void LLAttachmentsMgr::onIdle(void *)
 	LLAttachmentsMgr::instance().onIdle();
 }
 
+// FIXME this is basically the same code as LLAgentWearables::userAttachMultipleAttachments(),
+// should consolidate.
 void LLAttachmentsMgr::onIdle()
 {
 	// Make sure we got a region before trying anything else
@@ -73,7 +75,8 @@ void LLAttachmentsMgr::onIdle()
 	{
 		return;
 	}
-	
+	LL_DEBUGS("Avatar") << "attaching multiple, total obj_count " << obj_count << LL_ENDL;
+
 	// Limit number of packets to send
 	const S32 MAX_PACKETS_TO_SEND = 10;
 	const S32 OBJECTS_PER_PACKET = 4;
@@ -113,6 +116,8 @@ void LLAttachmentsMgr::onIdle()
 			LL_INFOS() << "Attempted to add non-existant item ID:" << attachment.mItemID << LL_ENDL;
 			continue;
 		}
+		LL_DEBUGS("Avatar") << "requesting " << item->getName()
+							<< " " << item->getLinkedUUID() << LL_ENDL;
 		S32 attachment_pt = attachment.mAttachmentPt;
 		if (attachment.mAdd) 
 			attachment_pt |= ATTACHMENT_ADD;
-- 
cgit v1.3


From 7b99314d846483167c665fabf8092e604554321c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 20 Feb 2015 15:54:27 -0500
Subject: MAINT-4653, DRTVWR-397 WIP - more code for tracking attachment
 operations, smarter handling of multiple requests.

---
 indra/llcharacter/lljoint.cpp             |  2 +-
 indra/newview/app_settings/logcontrol.xml |  1 +
 indra/newview/llagentwearables.cpp        |  8 +++---
 indra/newview/llappearancemgr.cpp         | 44 ++++++++++++++++++++++---------
 indra/newview/llappearancemgr.h           |  9 +++++++
 indra/newview/llattachmentsmgr.cpp        | 10 ++++---
 indra/newview/llinventorybridge.cpp       | 24 +++--------------
 indra/newview/llvoavatar.cpp              | 18 +++++++++++++
 8 files changed, 74 insertions(+), 42 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 6f22a7c6b7..40695bfa24 100755
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -290,7 +290,7 @@ const LLVector3& LLJoint::getPosition()
 
 bool do_debug_joint(const std::string& name)
 {
-	return true;
+	return false;
 }
 
 //--------------------------------------------------------------------
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 15cb5bc0eb..29639bb9c2 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,6 +42,7 @@
 						</array>
 					<key>tags</key>
 						<array>
+						     <string>Avatar</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Inventory</string>
 						     <string>SceneLoadTiming</string>
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 6f54e23e38..69eb478cd8 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1344,7 +1344,7 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo
 	if (objects_to_remove.empty())
 		return;
 
-	LL_DEBUGS("Avatar") << "removing " << objects_to_remove.size() << " objects" << LL_ENDL;
+	LL_DEBUGS("Avatar") << "ATT [ObjectDetach] removing " << objects_to_remove.size() << " objects" << LL_ENDL;
 	gMessageSystem->newMessage("ObjectDetach");
 	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
 	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -1360,7 +1360,7 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo
 		gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, objectp->getLocalID());
 		const LLUUID& item_id = objectp->getAttachmentItemID();
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
-		LL_DEBUGS("Avatar") << "removing object, item is " << (item ? item->getName() : "UNKNOWN") << item_id << LL_ENDL;
+		LL_DEBUGS("Avatar") << "ATT removing object, item is " << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	}
 	gMessageSystem->sendReliable(gAgent.getRegionHost());
 }
@@ -1373,7 +1373,7 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
 	S32 obj_count = obj_item_array.size();
 	if (obj_count > 0)
 	{
-		LL_DEBUGS("Avatar") << "attaching multiple, total obj_count " << obj_count << LL_ENDL;
+		LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple, total obj_count " << obj_count << LL_ENDL;
 	}
 
 	// Limit number of packets to send
@@ -1406,7 +1406,7 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
 		}
 
 		const LLInventoryItem* item = obj_item_array.at(i).get();
-		LL_DEBUGS("Avatar") << "requesting " << item->getName()
+		LL_DEBUGS("Avatar") << "ATT requesting " << item->getName()
 							<< " " << item->getLinkedUUID() << LL_ENDL;
 		msg->nextBlockFast(_PREHASH_ObjectData );
 		msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ac619631c0..ff645e2c9f 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -525,6 +525,12 @@ LLUpdateAppearanceAndEditWearableOnDestroy::LLUpdateAppearanceAndEditWearableOnD
 {
 }
 
+LLRequestAppearanceUpdateOnDestroy::~LLRequestAppearanceUpdateOnDestroy()
+{
+	LL_DEBUGS("Avatar") << "ATT requesting server appearance update" << LL_ENDL;
+	LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+}
+
 void edit_wearable_and_customize_avatar(LLUUID item_id)
 {
 	// Start editing the item if previously requested.
@@ -828,6 +834,12 @@ void LLWearableHoldingPattern::onAllComplete()
 		// pre-attachment states.
 		gAgentAvatarp->clearAttachmentPosOverrides();
 
+		if (objects_to_remove.size() || items_to_add.size())
+		{
+			LL_DEBUGS("Avatar") << "ATT will remove " << objects_to_remove.size()
+								<< " and add " << items_to_add.size() << " items" << LL_ENDL;
+		}
+
 		// Take off the attachments that will no longer be in the outfit.
 		LLAgentWearables::userRemoveMultipleAttachments(objects_to_remove);
 		
@@ -1402,20 +1414,26 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear,
 		break;
 
 		case LLAssetType::AT_BODYPART:
-		// TODO: investigate wearables may not be loaded at this point EXT-8231
-		
-		// Remove the existing wearables of the same type.
-		// Remove existing body parts anyway because we must not be able to wear e.g. two skins.
-		removeCOFLinksOfType(item_to_wear->getWearableType());
-		if (!cb && do_update)
 		{
-			cb = new LLUpdateAppearanceAndEditWearableOnDestroy(item_id_to_wear);
+			// TODO: investigate wearables may not be loaded at this point EXT-8231
+			
+			// Remove the existing wearables of the same type.
+			// Remove existing body parts anyway because we must not be able to wear e.g. two skins.
+			removeCOFLinksOfType(item_to_wear->getWearableType());
+			if (!cb && do_update)
+			{
+				cb = new LLUpdateAppearanceAndEditWearableOnDestroy(item_id_to_wear);
+			}
+			addCOFItemLink(item_to_wear, cb);
 		}
-		addCOFItemLink(item_to_wear, cb);
 		break;
 
 		case LLAssetType::AT_OBJECT:
-		rez_attachment(item_to_wear, NULL, replace);
+		{
+			LL_DEBUGS("Avatar") << "ATT wearing object. calling rez_attachment, item " << item_to_wear->getName()
+								<< " id " << item_to_wear->getLinkedUUID() << LL_ENDL;
+			rez_attachment(item_to_wear, NULL, replace);
+		}
 		break;
 
 		default: return false;;
@@ -3230,7 +3248,7 @@ void RequestAgentUpdateAppearanceResponder::onRequestRequested()
 	}
 
 	// Actually send the request.
-	LL_DEBUGS("Avatar") << "Will send request for cof_version " << cof_version << LL_ENDL;
+	LL_DEBUGS("Avatar") << "ATT sending bake request for cof_version " << cof_version << LL_ENDL;
 	mRetryPolicy->reset();
 	sendRequest();
 }
@@ -3899,7 +3917,7 @@ void dumpAttachmentSet(const std::set<LLUUID>& atts, const std::string& msg)
 void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
 {
 	LLViewerInventoryItem *item = gInventory.getItem(item_id);
-	LL_DEBUGS("Avatar") << "registering attachment "
+	LL_DEBUGS("Avatar") << "ATT registering attachment "
 						<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 
@@ -3910,10 +3928,10 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
 		// But it is not acceptable solution. See EXT-7777
 		if (!isLinkedInCOF(item_id))
 		{
-			LL_DEBUGS("Avatar") << "adding COF link for attachment "
+			LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
 								<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 			// FIXME replace with just a call to request bake update?
-			LLPointer<LLInventoryCallback> cb = new LLUpdateAppearanceOnDestroy();
+			LLPointer<LLInventoryCallback> cb = new LLRequestAppearanceUpdateOnDestroy();
 			LLAppearanceMgr::addCOFItemLink(item_id, cb);  // Add COF link for item.
 		}
 	}
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 7742a19c07..3799c89757 100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -311,6 +311,15 @@ private:
 	LLUUID mItemID;
 };
 
+class LLRequestAppearanceUpdateOnDestroy: public LLInventoryCallback
+{
+public:
+	LLRequestAppearanceUpdateOnDestroy() {}
+	~LLRequestAppearanceUpdateOnDestroy();
+
+	/* virtual */ void fire(const LLUUID& item_id) {}
+};
+
 LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id,const std::string& name);
 
 // Invoke a given callable after category contents are fully fetched.
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index d7c4a24fb5..8103d89955 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -47,6 +47,10 @@ void LLAttachmentsMgr::addAttachment(const LLUUID& item_id,
 									 const U8 attachment_pt,
 									 const BOOL add)
 {
+	LLViewerInventoryItem *item = gInventory.getItem(item_id);
+	LL_DEBUGS("Avatar") << "ATT adding attachment to mPendingAttachments "
+						<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+
 	AttachmentsInfo attachment;
 	attachment.mItemID = item_id;
 	attachment.mAttachmentPt = attachment_pt;
@@ -75,7 +79,7 @@ void LLAttachmentsMgr::onIdle()
 	{
 		return;
 	}
-	LL_DEBUGS("Avatar") << "attaching multiple, total obj_count " << obj_count << LL_ENDL;
+	LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple from mPendingAttachments, total obj_count " << obj_count << LL_ENDL;
 
 	// Limit number of packets to send
 	const S32 MAX_PACKETS_TO_SEND = 10;
@@ -113,10 +117,10 @@ void LLAttachmentsMgr::onIdle()
 		LLViewerInventoryItem* item = gInventory.getItem(attachment.mItemID);
 		if (!item)
 		{
-			LL_INFOS() << "Attempted to add non-existant item ID:" << attachment.mItemID << LL_ENDL;
+			LL_INFOS() << "Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
 			continue;
 		}
-		LL_DEBUGS("Avatar") << "requesting " << item->getName()
+		LL_DEBUGS("Avatar") << "ATT requesting from mPendingAttachments " << item->getName()
 							<< " " << item->getLinkedUUID() << LL_ENDL;
 		S32 attachment_pt = attachment.mAttachmentPt;
 		if (attachment.mAdd) 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1910656066..0af60c0953 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5374,6 +5374,8 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
 		LL_WARNS() << "duplicate attachment request, ignoring" << LL_ENDL;
 		return;
 	}
+
+	LL_DEBUGS("Avatar") << "ATT add rez request for " << item->getName() << " id " << item_id << LL_ENDL;
 	gAgentAvatarp->addAttachmentRequest(item_id);
 
 	S32 attach_pt = 0;
@@ -5424,33 +5426,13 @@ bool confirm_attachment_rez(const LLSD& notification, const LLSD& response)
 
 		if (itemp)
 		{
-			/*
-			{
-				U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
-				
-				LLMessageSystem* msg = gMessageSystem;
-				msg->newMessageFast(_PREHASH_RezSingleAttachmentFromInv);
-				msg->nextBlockFast(_PREHASH_AgentData);
-				msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-				msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-				msg->nextBlockFast(_PREHASH_ObjectData);
-				msg->addUUIDFast(_PREHASH_ItemID, itemp->getUUID());
-				msg->addUUIDFast(_PREHASH_OwnerID, itemp->getPermissions().getOwner());
-				msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
-				pack_permissions_slam(msg, itemp->getFlags(), itemp->getPermissions());
-				msg->addStringFast(_PREHASH_Name, itemp->getName());
-				msg->addStringFast(_PREHASH_Description, itemp->getDescription());
-				msg->sendReliable(gAgent.getRegion()->getHost());
-				return false;
-			}
-			*/
-
 			// Queue up attachments to be sent in next idle tick, this way the
 			// attachments are batched up all into one message versus each attachment
 			// being sent in its own separate attachments message.
 			U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
 			BOOL is_add = notification["payload"]["is_add"].asBoolean();
 
+			LL_DEBUGS("Avatar") << "ATT calling addAttachment " << (itemp ? itemp->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
 			LLAttachmentsMgr::instance().addAttachment(item_id,
 													   attachment_pt,
 													   is_add);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b54f341c31..f9a22690c2 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5730,10 +5730,21 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
 //-----------------------------------------------------------------------------
 const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_object)
 {
+	if (isSelf())
+	{
+		const LLUUID& item_id = viewer_object->getAttachmentItemID();
+		LLViewerInventoryItem *item = gInventory.getItem(item_id);
+		LL_DEBUGS("Avatar") << "ATT attaching object "
+							<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;	
+	}
 	LLViewerJointAttachment* attachment = getTargetAttachmentPoint(viewer_object);
 
 	if (!attachment || !attachment->addObject(viewer_object))
 	{
+		const LLUUID& item_id = viewer_object->getAttachmentItemID();
+		LLViewerInventoryItem *item = gInventory.getItem(item_id);
+		LL_DEBUGS("Avatar") << "ATT attach failed "
+							<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;	
 		return 0;
 	}
 
@@ -5793,6 +5804,13 @@ void LLVOAvatar::lazyAttach()
 		LLPointer<LLViewerObject> cur_attachment = mPendingAttachment[i];
 		if (cur_attachment->mDrawable)
 		{
+			if (isSelf())
+			{
+				const LLUUID& item_id = cur_attachment->getAttachmentItemID();
+				LLViewerInventoryItem *item = gInventory.getItem(item_id);
+				LL_DEBUGS("Avatar") << "ATT attaching object "
+									<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+			}
 			if (!attachObject(cur_attachment))
 			{	// Drop it
 				LL_WARNS() << "attachObject() failed for " 
-- 
cgit v1.3


From 58ab202aa2615df8038ac8c47e2f170c06a990a6 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 24 Feb 2015 16:19:14 -0500
Subject: MAINT-4917 WIP - batch COF link request before batch attachment
 request. Should only generate one bake request.

---
 indra/newview/llattachmentsmgr.cpp  | 90 +++++++++++++++++++++++++++++++++----
 indra/newview/llattachmentsmgr.h    | 20 +++++----
 indra/newview/llinventorybridge.cpp |  2 +-
 3 files changed, 95 insertions(+), 17 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 8103d89955..a38bae207d 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -28,6 +28,7 @@
 #include "llattachmentsmgr.h"
 
 #include "llagent.h"
+#include "llappearancemgr.h"
 #include "llinventorymodel.h"
 #include "lltooldraganddrop.h" // pack_permissions_slam
 #include "llviewerinventory.h"
@@ -64,9 +65,83 @@ void LLAttachmentsMgr::onIdle(void *)
 	LLAttachmentsMgr::instance().onIdle();
 }
 
+void LLAttachmentsMgr::onIdle()
+{
+	// Make sure we got a region before trying anything else
+	if( !gAgent.getRegion() )
+	{
+		return;
+	}
+
+	linkPendingAttachments();
+}
+
+class LLAttachAfterLinkCallback: public LLInventoryCallback
+{
+public:
+	LLAttachAfterLinkCallback(const LLAttachmentsMgr::attachments_vec_t& to_link_and_attach):
+		mToLinkAndAttach(to_link_and_attach)
+	{
+	}
+
+	~LLAttachAfterLinkCallback()
+	{
+		LL_DEBUGS("Avatar") << "destructor" << LL_ENDL; 
+		for (LLAttachmentsMgr::attachments_vec_t::const_iterator it = mToLinkAndAttach.begin();
+			 it != mToLinkAndAttach.end(); ++it)
+		{
+			const LLAttachmentsMgr::AttachmentsInfo& att_info = *it;
+			if (!LLAppearanceMgr::instance().isLinkedInCOF(att_info.mItemID))
+			{
+				LLViewerInventoryItem *item = gInventory.getItem(att_info.mItemID);
+				LL_WARNS() << "ATT COF link creation failed for att item " << (item ? item->getName() : "UNKNOWN") << " id "
+						   << att_info.mItemID << LL_ENDL;
+			}
+		}
+		LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+		LLAttachmentsMgr::instance().requestAttachments(mToLinkAndAttach);
+	}
+
+	/* virtual */ void fire(const LLUUID& inv_item)
+	{
+		LL_DEBUGS("Avatar") << inv_item << LL_ENDL;
+	}
+
+private:
+	LLAttachmentsMgr::attachments_vec_t mToLinkAndAttach;
+};
+
+void LLAttachmentsMgr::linkPendingAttachments()
+{
+	if (mPendingAttachments.size())
+	{
+		LLPointer<LLInventoryCallback> cb = new LLAttachAfterLinkCallback(mPendingAttachments);
+		LLInventoryObject::const_object_list_t inv_items_to_link;
+		for (attachments_vec_t::const_iterator it = mPendingAttachments.begin();
+			 it != mPendingAttachments.end(); ++it)
+		{
+			const AttachmentsInfo& att_info = *it;
+			LLViewerInventoryItem *item = gInventory.getItem(att_info.mItemID);
+			if (item)
+			{
+				inv_items_to_link.push_back(item);
+			}
+			else
+			{
+				LL_WARNS() << "ATT unable to link requested attachment " << att_info.mItemID
+						   << ", item not found in inventory" << LL_ENDL;
+			}
+		}
+		link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
+
+		mPendingAttachments.clear();
+	}
+
+}
+
 // FIXME this is basically the same code as LLAgentWearables::userAttachMultipleAttachments(),
 // should consolidate.
-void LLAttachmentsMgr::onIdle()
+void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_requests)
 {
 	// Make sure we got a region before trying anything else
 	if( !gAgent.getRegion() )
@@ -74,12 +149,13 @@ void LLAttachmentsMgr::onIdle()
 		return;
 	}
 
-	S32 obj_count = mPendingAttachments.size();
+	S32 obj_count = attachment_requests.size();
 	if (obj_count == 0)
 	{
 		return;
 	}
-	LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple from mPendingAttachments, total obj_count " << obj_count << LL_ENDL;
+	LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple from attachment_requests,"
+		" total obj_count " << obj_count << LL_ENDL;
 
 	// Limit number of packets to send
 	const S32 MAX_PACKETS_TO_SEND = 10;
@@ -96,8 +172,8 @@ void LLAttachmentsMgr::onIdle()
 
 	
 	S32 i = 0;
-	for (attachments_vec_t::const_iterator iter = mPendingAttachments.begin();
-		 iter != mPendingAttachments.end();
+	for (attachments_vec_t::const_iterator iter = attachment_requests.begin();
+		 iter != attachment_requests.end();
 		 ++iter)
 	{
 		if( 0 == (i % OBJECTS_PER_PACKET) )
@@ -120,7 +196,7 @@ void LLAttachmentsMgr::onIdle()
 			LL_INFOS() << "Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
 			continue;
 		}
-		LL_DEBUGS("Avatar") << "ATT requesting from mPendingAttachments " << item->getName()
+		LL_DEBUGS("Avatar") << "ATT requesting from attachment_requests " << item->getName()
 							<< " " << item->getLinkedUUID() << LL_ENDL;
 		S32 attachment_pt = attachment.mAttachmentPt;
 		if (attachment.mAdd) 
@@ -141,6 +217,4 @@ void LLAttachmentsMgr::onIdle()
 		}
 		i++;
 	}
-
-	mPendingAttachments.clear();
 }
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index 1d8ab74dfd..c145fa032b 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -49,24 +49,28 @@ class LLViewerInventoryItem;
 class LLAttachmentsMgr: public LLSingleton<LLAttachmentsMgr>
 {
 public:
+	struct AttachmentsInfo
+	{
+		LLUUID mItemID;
+		U8 mAttachmentPt;
+		BOOL mAdd;
+	};
+	typedef std::vector<AttachmentsInfo> attachments_vec_t;
+
 	LLAttachmentsMgr();
 	virtual ~LLAttachmentsMgr();
 
 	void addAttachment(const LLUUID& item_id,
 					   const U8 attachment_pt,
 					   const BOOL add);
+	void requestAttachments(const attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
+
 protected:
 	void onIdle();
-private:
-	struct AttachmentsInfo
-	{
-		LLUUID mItemID;
-		U8 mAttachmentPt;
-		BOOL mAdd;
-	};
+	void linkPendingAttachments();
 
-	typedef std::vector<AttachmentsInfo> attachments_vec_t;
+private:
 	attachments_vec_t mPendingAttachments;
 };
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 0af60c0953..32d1da434e 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5371,7 +5371,7 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
 		(gAgentAvatarp->attachmentWasRequested(item_id) ||
 		 gAgentAvatarp->isWearingAttachment(item_id)))
 	{
-		LL_WARNS() << "duplicate attachment request, ignoring" << LL_ENDL;
+		LL_WARNS() << "ATT duplicate attachment request, ignoring" << LL_ENDL;
 		return;
 	}
 
-- 
cgit v1.3


From 43aac9ad1d303b24432623e253f568fd82b77a2a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 27 Feb 2015 10:28:50 -0500
Subject: MAINT-4918 WIP - batch up detach requests for objects

---
 indra/newview/llappearancemgr.cpp      |  2 ++
 indra/newview/llattachmentsmgr.cpp     |  2 ++
 indra/newview/llinventorybridge.h      |  6 ++++
 indra/newview/llinventoryfunctions.cpp | 56 ++++++++++++++++++++++++++++++----
 4 files changed, 60 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 00e63adc93..783d3a822e 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3975,6 +3975,8 @@ BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
 	return FALSE;
 }
 
+// FIXME apparent duplicate of isLinkedInCOF()
+
 // static
 bool LLAppearanceMgr::isLinkInCOF(const LLUUID& obj_id)
 {
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index a38bae207d..e64ed6563a 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -117,6 +117,7 @@ void LLAttachmentsMgr::linkPendingAttachments()
 	{
 		LLPointer<LLInventoryCallback> cb = new LLAttachAfterLinkCallback(mPendingAttachments);
 		LLInventoryObject::const_object_list_t inv_items_to_link;
+		LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mPendingAttachments.size() << " object(s):" << LL_ENDL;
 		for (attachments_vec_t::const_iterator it = mPendingAttachments.begin();
 			 it != mPendingAttachments.end(); ++it)
 		{
@@ -124,6 +125,7 @@ void LLAttachmentsMgr::linkPendingAttachments()
 			LLViewerInventoryItem *item = gInventory.getItem(att_info.mItemID);
 			if (item)
 			{
+				LL_DEBUGS("Avatar") << "ATT - requesting COF link for " << item->getName() << LL_ENDL;
 				inv_items_to_link.push_back(item);
 			}
 			else
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index e8d5db4437..8dde2c33b7 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -687,4 +687,10 @@ void hide_context_entries(LLMenuGL& menu,
 						  const menuentry_vec_t &entries_to_show, 
 						  const menuentry_vec_t &disabled_entries);
 
+// Helper functions to classify actions.
+bool isAddAction(const std::string& action);
+bool isRemoveAction(const std::string& action);
+bool isMarketplaceCopyAction(const std::string& action);
+bool isMarketplaceSendAction(const std::string& action);
+
 #endif // LL_LLINVENTORYBRIDGE_H
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 1abc09bf3b..6096cad3a5 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1060,6 +1060,34 @@ void LLOpenFoldersWithSelection::doFolder(LLFolderViewFolder* folder)
 	}
 }
 
+// Succeeds iff all selected items are bridges to objects, in which
+// case returns their corresponding uuids.
+bool get_selection_object_uuids(LLFolderView *root, uuid_vec_t& ids)
+{
+	uuid_vec_t results;
+	S32 non_object = 0;
+	LLFolderView::selected_items_t selectedItems = root->getSelectedItems();
+	for(LLFolderView::selected_items_t::iterator it = selectedItems.begin(); it != selectedItems.end(); ++it)
+	{
+		LLObjectBridge *view_model = dynamic_cast<LLObjectBridge *>((*it)->getViewModelItem());
+
+		if(view_model && view_model->getUUID().notNull())
+		{
+			results.push_back(view_model->getUUID());
+		}
+		else
+		{
+			non_object++;
+		}
+	}
+	if (non_object == 0)
+	{
+		ids = results;
+		return true;
+	}
+	return false;
+}
+
 void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root, const std::string& action)
 {
 	if ("rename" == action)
@@ -1116,13 +1144,29 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
 	std::set<LLFolderViewItem*>::iterator set_iter;
 
-	for (set_iter = selected_items.begin(); set_iter != selected_items.end(); ++set_iter)
+
+	// This rather warty piece of code is to allow items to be removed
+	// from the avatar in a batch, eliminating redundant
+	// updateAppearanceFromCOF() requests further down the line. (MAINT-4918)
+	//
+	// There are probably other cases where similar batching would be
+	// desirable, but the current item-by-item performAction()
+	// approach would need to be reworked.
+	uuid_vec_t object_uuids_to_remove;
+	if (isRemoveAction(action) && get_selection_object_uuids(root, object_uuids_to_remove))
 	{
-		LLFolderViewItem* folder_item = *set_iter;
-		if(!folder_item) continue;
-		LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
-		if(!bridge) continue;
-		bridge->performAction(model, action);
+		LLAppearanceMgr::instance().removeItemsFromAvatar(object_uuids_to_remove);
+	}
+	else
+	{
+		for (set_iter = selected_items.begin(); set_iter != selected_items.end(); ++set_iter)
+		{
+			LLFolderViewItem* folder_item = *set_iter;
+			if(!folder_item) continue;
+			LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+			if(!bridge) continue;
+			bridge->performAction(model, action);
+		}
 	}
 
 	LLFloater::setFloaterHost(NULL);
-- 
cgit v1.3


From 8169cde890f70320340a08cbfa29d16033572a9b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 3 Mar 2015 17:08:34 -0500
Subject: MAINT-4653 WIP

---
 indra/newview/llappearancemgr.cpp  | 4 ++--
 indra/newview/llattachmentsmgr.cpp | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f8c964cb9a..24169c152b 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3948,13 +3948,13 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
 void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
 {
 	LLViewerInventoryItem *item = gInventory.getItem(item_id);
-	LL_DEBUGS("Avatar") << "unregistering attachment "
+	LL_DEBUGS("Avatar") << "ATT unregistering attachment "
 						<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 
 	if (mAttachmentInvLinkEnabled)
 	{
-		LL_DEBUGS("Avatar") << "removing COF link for attachment "
+		LL_DEBUGS("Avatar") << "ATT removing COF link for attachment "
 							<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 		LLAppearanceMgr::removeCOFItemLinks(item_id);
 	}
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index e64ed6563a..64dcaab6c0 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -111,10 +111,13 @@ private:
 	LLAttachmentsMgr::attachments_vec_t mToLinkAndAttach;
 };
 
+//#define COF_LINK_FIRST
+
 void LLAttachmentsMgr::linkPendingAttachments()
 {
 	if (mPendingAttachments.size())
 	{
+#ifdef COF_LINK_FIRST
 		LLPointer<LLInventoryCallback> cb = new LLAttachAfterLinkCallback(mPendingAttachments);
 		LLInventoryObject::const_object_list_t inv_items_to_link;
 		LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mPendingAttachments.size() << " object(s):" << LL_ENDL;
@@ -135,7 +138,9 @@ void LLAttachmentsMgr::linkPendingAttachments()
 			}
 		}
 		link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
-
+#else
+		requestAttachments(mPendingAttachments);
+#endif
 		mPendingAttachments.clear();
 	}
 
-- 
cgit v1.3


From 090d3097d569922b7c3b681cb77ff14a29a60b07 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 18 Mar 2015 21:41:47 -0400
Subject: MAINT-4917 WIP - Attachment deferred bulk COF linking WIP

---
 indra/newview/llagentwearables.cpp  |  56 +++------------
 indra/newview/llappearancemgr.cpp   |  21 +-----
 indra/newview/llappearancemgr.h     |   6 +-
 indra/newview/llattachmentsmgr.cpp  | 133 ++++++++++++++++++++++++++++--------
 indra/newview/llattachmentsmgr.h    |  25 +++++--
 indra/newview/llinventorybridge.cpp |  12 ++--
 indra/newview/llvoavatarself.cpp    |  41 +----------
 indra/newview/llvoavatarself.h      |   7 --
 8 files changed, 141 insertions(+), 160 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 69eb478cd8..4a395f547a 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagentwearables.h"
 
+#include "llattachmentsmgr.h"
 #include "llaccordionctrltab.h"
 #include "llagent.h"
 #include "llagentcamera.h"
@@ -1373,55 +1374,16 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
 	S32 obj_count = obj_item_array.size();
 	if (obj_count > 0)
 	{
-		LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple, total obj_count " << obj_count << LL_ENDL;
+		LL_DEBUGS("Avatar") << "ATT attaching multiple, total obj_count " << obj_count << LL_ENDL;
 	}
 
-	// Limit number of packets to send
-	const S32 MAX_PACKETS_TO_SEND = 10;
-	const S32 OBJECTS_PER_PACKET = 4;
-	const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
-	if( obj_count > MAX_OBJECTS_TO_SEND )
-	{
-		obj_count = MAX_OBJECTS_TO_SEND;
-	}
-				
-	// Create an id to keep the parts of the compound message together
-	LLUUID compound_msg_id;
-	compound_msg_id.generate();
-	LLMessageSystem* msg = gMessageSystem;
-
-	for(S32 i = 0; i < obj_count; ++i)
-	{
-		if( 0 == (i % OBJECTS_PER_PACKET) )
-		{
-			// Start a new message chunk
-			msg->newMessageFast(_PREHASH_RezMultipleAttachmentsFromInv);
-			msg->nextBlockFast(_PREHASH_AgentData);
-			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-			msg->nextBlockFast(_PREHASH_HeaderData);
-			msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
-			msg->addU8Fast(_PREHASH_TotalObjects, obj_count );
-			msg->addBOOLFast(_PREHASH_FirstDetachAll, false );
-		}
-
-		const LLInventoryItem* item = obj_item_array.at(i).get();
-		LL_DEBUGS("Avatar") << "ATT requesting " << item->getName()
-							<< " " << item->getLinkedUUID() << LL_ENDL;
-		msg->nextBlockFast(_PREHASH_ObjectData );
-		msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
-		msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
-		msg->addU8Fast(_PREHASH_AttachmentPt, 0 | ATTACHMENT_ADD);	// Wear at the previous or default attachment point
-		pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
-		msg->addStringFast(_PREHASH_Name, item->getName());
-		msg->addStringFast(_PREHASH_Description, item->getDescription());
-
-		if( (i+1 == obj_count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
-		{
-			// End of message chunk
-			msg->sendReliable( gAgent.getRegion()->getHost() );
-		}
-	}
+    for(LLInventoryModel::item_array_t::const_iterator it = obj_item_array.begin();
+        it != obj_item_array.end();
+        ++it)
+    {
+		const LLInventoryItem* item = *it;
+        LLAttachmentsMgr::instance().addAttachmentRequest(item->getLinkedUUID(), 0, TRUE);
+    }
 }
 
 // Returns false if the given wearable is already topmost/bottommost
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 24169c152b..258d69d546 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -525,7 +525,7 @@ LLUpdateAppearanceAndEditWearableOnDestroy::LLUpdateAppearanceAndEditWearableOnD
 {
 }
 
-LLRequestAppearanceUpdateOnDestroy::~LLRequestAppearanceUpdateOnDestroy()
+LLRequestServerAppearanceUpdateOnDestroy::~LLRequestServerAppearanceUpdateOnDestroy()
 {
 	LL_DEBUGS("Avatar") << "ATT requesting server appearance update" << LL_ENDL;
 	LLAppearanceMgr::instance().requestServerAppearanceUpdate();
@@ -3925,24 +3925,7 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
 						<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 
-	if (mAttachmentInvLinkEnabled)
-	{
-		// we have to pass do_update = true to call LLAppearanceMgr::updateAppearanceFromCOF.
-		// it will trigger gAgentWariables.notifyLoadingFinished()
-		// But it is not acceptable solution. See EXT-7777
-		if (!isLinkedInCOF(item_id))
-		{
-			LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
-								<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
-			// FIXME replace with just a call to request bake update?
-			LLPointer<LLInventoryCallback> cb = new LLRequestAppearanceUpdateOnDestroy();
-			LLAppearanceMgr::addCOFItemLink(item_id, cb);  // Add COF link for item.
-		}
-	}
-	else
-	{
-		//LL_INFOS() << "no link changes, inv link not enabled" << LL_ENDL;
-	}
+	LLAttachmentsMgr::instance().onAttachmentArrived(item_id);
 }
 
 void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index e6094d4b53..dfe392e3b7 100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -306,11 +306,11 @@ private:
 	LLUUID mItemID;
 };
 
-class LLRequestAppearanceUpdateOnDestroy: public LLInventoryCallback
+class LLRequestServerAppearanceUpdateOnDestroy: public LLInventoryCallback
 {
 public:
-	LLRequestAppearanceUpdateOnDestroy() {}
-	~LLRequestAppearanceUpdateOnDestroy();
+	LLRequestServerAppearanceUpdateOnDestroy() {}
+	~LLRequestServerAppearanceUpdateOnDestroy();
 
 	/* virtual */ void fire(const LLUUID& item_id) {}
 };
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 64dcaab6c0..cc83500491 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -44,9 +44,9 @@ LLAttachmentsMgr::~LLAttachmentsMgr()
 {
 }
 
-void LLAttachmentsMgr::addAttachment(const LLUUID& item_id,
-									 const U8 attachment_pt,
-									 const BOOL add)
+void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
+                                            const U8 attachment_pt,
+                                            const BOOL add)
 {
 	LLViewerInventoryItem *item = gInventory.getItem(item_id);
 	LL_DEBUGS("Avatar") << "ATT adding attachment to mPendingAttachments "
@@ -57,6 +57,8 @@ void LLAttachmentsMgr::addAttachment(const LLUUID& item_id,
 	attachment.mAttachmentPt = attachment_pt;
 	attachment.mAdd = add;
 	mPendingAttachments.push_back(attachment);
+
+    addAttachmentRequestTime(item_id);
 }
 
 // static
@@ -73,7 +75,9 @@ void LLAttachmentsMgr::onIdle()
 		return;
 	}
 
-	linkPendingAttachments();
+	requestPendingAttachments();
+
+    linkRecentlyArrivedAttachments();
 }
 
 class LLAttachAfterLinkCallback: public LLInventoryCallback
@@ -111,39 +115,58 @@ private:
 	LLAttachmentsMgr::attachments_vec_t mToLinkAndAttach;
 };
 
-//#define COF_LINK_FIRST
-
-void LLAttachmentsMgr::linkPendingAttachments()
+void LLAttachmentsMgr::requestPendingAttachments()
 {
 	if (mPendingAttachments.size())
 	{
-#ifdef COF_LINK_FIRST
-		LLPointer<LLInventoryCallback> cb = new LLAttachAfterLinkCallback(mPendingAttachments);
-		LLInventoryObject::const_object_list_t inv_items_to_link;
-		LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mPendingAttachments.size() << " object(s):" << LL_ENDL;
-		for (attachments_vec_t::const_iterator it = mPendingAttachments.begin();
-			 it != mPendingAttachments.end(); ++it)
-		{
-			const AttachmentsInfo& att_info = *it;
-			LLViewerInventoryItem *item = gInventory.getItem(att_info.mItemID);
-			if (item)
-			{
-				LL_DEBUGS("Avatar") << "ATT - requesting COF link for " << item->getName() << LL_ENDL;
-				inv_items_to_link.push_back(item);
-			}
-			else
-			{
-				LL_WARNS() << "ATT unable to link requested attachment " << att_info.mItemID
-						   << ", item not found in inventory" << LL_ENDL;
-			}
-		}
-		link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
-#else
 		requestAttachments(mPendingAttachments);
-#endif
 		mPendingAttachments.clear();
 	}
+}
+
+void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
+{
+    const F32 COF_LINK_BATCH_TIME = 5.0F;
+    
+    // One or more attachments have arrived but not been processed for COF links
+    if (mRecentlyArrivedAttachments.size())
+    {
+        if (mAttachmentRequests.empty())
+        {
+            // Not waiting for more
+            LL_DEBUGS("Avatar") << "ATT all pending attachments have arrived" << LL_ENDL;
+        }
+        else if (mCOFLinkBatchTimer.getElapsedTimeF32() > COF_LINK_BATCH_TIME)
+        {
+            LL_DEBUGS("Avatar") << mAttachmentRequests.size()
+                                << "ATT pending attachments have not arrived but wait time exceeded" << LL_ENDL;
+        }
+        else
+        {
+            return;
+        }
 
+        LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mRecentlyArrivedAttachments.size() << LL_ENDL;
+		LLInventoryObject::const_object_list_t inv_items_to_link;
+        for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
+             it != mRecentlyArrivedAttachments.end(); ++it)
+        {
+            if (!LLAppearanceMgr::instance().isLinkedInCOF(*it))
+            {
+                LLUUID item_id = *it;
+                LLViewerInventoryItem *item = gInventory.getItem(item_id);
+                LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
+                                    << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
+                inv_items_to_link.push_back(item);
+            }
+        }
+        if (inv_items_to_link.size())
+        {
+            LLPointer<LLInventoryCallback> cb = new LLRequestServerAppearanceUpdateOnDestroy();
+            link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
+        }
+        mRecentlyArrivedAttachments.clear();
+    }
 }
 
 // FIXME this is basically the same code as LLAgentWearables::userAttachMultipleAttachments(),
@@ -225,3 +248,53 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 		i++;
 	}
 }
+
+void LLAttachmentsMgr::addAttachmentRequestTime(const LLUUID& inv_item_id)
+{
+    LLInventoryItem *item = gInventory.getItem(inv_item_id);
+    LL_DEBUGS("Avatar") << "ATT add request time " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+	LLTimer current_time;
+	mAttachmentRequests[inv_item_id] = current_time;
+}
+
+void LLAttachmentsMgr::removeAttachmentRequestTime(const LLUUID& inv_item_id)
+{
+    LLInventoryItem *item = gInventory.getItem(inv_item_id);
+    LL_DEBUGS("Avatar") << "ATT remove request time " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+	mAttachmentRequests.erase(inv_item_id);
+}
+
+BOOL LLAttachmentsMgr::attachmentWasRequestedRecently(const LLUUID& inv_item_id, F32 seconds) const
+{
+	std::map<LLUUID,LLTimer>::const_iterator it = mAttachmentRequests.find(inv_item_id);
+	if (it != mAttachmentRequests.end())
+	{
+		const LLTimer& request_time = it->second;
+		F32 request_time_elapsed = request_time.getElapsedTimeF32();
+		if (request_time_elapsed > seconds)
+		{
+            LLInventoryItem *item = gInventory.getItem(inv_item_id);
+            LL_DEBUGS("Avatar") << "ATT time ignored, exceeded " << seconds
+                                << " " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
+{
+    removeAttachmentRequestTime(inv_item_id);
+    if (mRecentlyArrivedAttachments.empty())
+    {
+        mCOFLinkBatchTimer.reset();
+    }
+    mRecentlyArrivedAttachments.insert(inv_item_id);
+}
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index c145fa032b..c84229475a 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -60,18 +60,31 @@ public:
 	LLAttachmentsMgr();
 	virtual ~LLAttachmentsMgr();
 
-	void addAttachment(const LLUUID& item_id,
-					   const U8 attachment_pt,
-					   const BOOL add);
+	void addAttachmentRequest(const LLUUID& item_id,
+                              const U8 attachment_pt,
+                              const BOOL add);
 	void requestAttachments(const attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
 
-protected:
-	void onIdle();
-	void linkPendingAttachments();
+	BOOL attachmentWasRequestedRecently(const LLUUID& inv_item_id, F32 seconds) const;
+	void addAttachmentRequestTime(const LLUUID& inv_item_id);
+    void onAttachmentArrived(const LLUUID& inv_item_id);
 
 private:
+	void removeAttachmentRequestTime(const LLUUID& inv_item_id);
+	void onIdle();
+	void requestPendingAttachments();
+	void linkRecentlyArrivedAttachments();
+
+    // Attachments that we are planning to rez but haven't requested from the server yet.
 	attachments_vec_t mPendingAttachments;
+
+	// Attachments that have been requested from server but have not arrived yet.
+	std::map<LLUUID,LLTimer> mAttachmentRequests;
+
+    // Attachments that have arrived but have not been linked in the COF yet.
+    std::set<LLUUID> mRecentlyArrivedAttachments;
+    LLTimer mCOFLinkBatchTimer;
 };
 
 #endif
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 32d1da434e..e44de6f91e 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5367,17 +5367,15 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
 	const LLUUID& item_id = item->getLinkedUUID();
 
 	// Check for duplicate request.
+	const F32 MAX_TIME_SINCE_REQUEST = 5.0F;
 	if (isAgentAvatarValid() &&
-		(gAgentAvatarp->attachmentWasRequested(item_id) ||
+		(LLAttachmentsMgr::instance().attachmentWasRequestedRecently(item_id, MAX_TIME_SINCE_REQUEST) ||
 		 gAgentAvatarp->isWearingAttachment(item_id)))
 	{
 		LL_WARNS() << "ATT duplicate attachment request, ignoring" << LL_ENDL;
 		return;
 	}
 
-	LL_DEBUGS("Avatar") << "ATT add rez request for " << item->getName() << " id " << item_id << LL_ENDL;
-	gAgentAvatarp->addAttachmentRequest(item_id);
-
 	S32 attach_pt = 0;
 	if (isAgentAvatarValid() && attachment)
 	{
@@ -5432,10 +5430,8 @@ bool confirm_attachment_rez(const LLSD& notification, const LLSD& response)
 			U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
 			BOOL is_add = notification["payload"]["is_add"].asBoolean();
 
-			LL_DEBUGS("Avatar") << "ATT calling addAttachment " << (itemp ? itemp->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
-			LLAttachmentsMgr::instance().addAttachment(item_id,
-													   attachment_pt,
-													   is_add);
+			LL_DEBUGS("Avatar") << "ATT calling addAttachmentRequest " << (itemp ? itemp->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+			LLAttachmentsMgr::instance().addAttachmentRequest(item_id, attachment_pt, is_add);
 		}
 	}
 	return false;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 3f3cd25f95..0859355b18 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -38,6 +38,7 @@
 #include "pipeline.h"
 
 #include "llagent.h" //  Get state values from here
+#include "llattachmentsmgr.h"
 #include "llagentcamera.h"
 #include "llagentwearables.h"
 #include "llhudeffecttrail.h"
@@ -1050,44 +1051,6 @@ BOOL LLVOAvatarSelf::isWearingAttachment(const LLUUID& inv_item_id) const
 	return FALSE;
 }
 
-//-----------------------------------------------------------------------------
-BOOL LLVOAvatarSelf::attachmentWasRequested(const LLUUID& inv_item_id) const
-{
-	const F32 REQUEST_EXPIRATION_SECONDS = 5.0;  // any request older than this is ignored/removed.
-	std::map<LLUUID,LLTimer>::iterator it = mAttachmentRequests.find(inv_item_id);
-	if (it != mAttachmentRequests.end())
-	{
-		const LLTimer& request_time = it->second;
-		F32 request_time_elapsed = request_time.getElapsedTimeF32();
-		if (request_time_elapsed > REQUEST_EXPIRATION_SECONDS)
-		{
-			mAttachmentRequests.erase(it);
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-
-//-----------------------------------------------------------------------------
-void LLVOAvatarSelf::addAttachmentRequest(const LLUUID& inv_item_id)
-{
-	LLTimer current_time;
-	mAttachmentRequests[inv_item_id] = current_time;
-}
-
-//-----------------------------------------------------------------------------
-void LLVOAvatarSelf::removeAttachmentRequest(const LLUUID& inv_item_id)
-{
-	mAttachmentRequests.erase(inv_item_id);
-}
-
 //-----------------------------------------------------------------------------
 // getWornAttachment()
 //-----------------------------------------------------------------------------
@@ -1154,8 +1117,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
 	{
 		const LLUUID& attachment_id = viewer_object->getAttachmentItemID();
 		LLAppearanceMgr::instance().registerAttachment(attachment_id);
-		// Clear any pending requests once the attachment arrives.
-		removeAttachmentRequest(attachment_id);
 		updateLODRiggedAttachments();		
 	}
 
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 5f36872575..c6a038f558 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -289,19 +289,12 @@ protected:
 public:
 	void 				updateAttachmentVisibility(U32 camera_mode);
 	BOOL 				isWearingAttachment(const LLUUID& inv_item_id) const;
-	BOOL				attachmentWasRequested(const LLUUID& inv_item_id) const;
-	void				addAttachmentRequest(const LLUUID& inv_item_id);
-	void				removeAttachmentRequest(const LLUUID& inv_item_id);
 	LLViewerObject* 	getWornAttachment(const LLUUID& inv_item_id);
 	bool				getAttachedPointName(const LLUUID& inv_item_id, std::string& name) const;
 	/*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object);
 	/*virtual*/ BOOL 	detachObject(LLViewerObject *viewer_object);
 	static BOOL			detachAttachmentIntoInventory(const LLUUID& item_id);
 
-private:
-	// Track attachments that have been requested but have not arrived yet.
-	mutable std::map<LLUUID,LLTimer> mAttachmentRequests;
-
 	//--------------------------------------------------------------------
 	// HUDs
 	//--------------------------------------------------------------------
-- 
cgit v1.3


From 8963185f5bea5af8ede04f41423ae1f822d80899 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 19 Mar 2015 17:05:55 -0400
Subject: MAINT-4917 WIP - comments and bug fixes for batching up COF link
 requests after attachments added.

---
 indra/newview/llagentwearables.cpp  |   2 -
 indra/newview/llappearancemgr.cpp   |   2 +-
 indra/newview/llattachmentsmgr.cpp  | 187 +++++++++++++++++++-----------------
 indra/newview/llattachmentsmgr.h    |  42 +++++---
 indra/newview/llinventorybridge.cpp |   4 +-
 5 files changed, 131 insertions(+), 106 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 4a395f547a..4d46a331c8 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1366,8 +1366,6 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo
 	gMessageSystem->sendReliable(gAgent.getRegionHost());
 }
 
-// FIXME this is basically the same code as LLAttachmentsMgr::onIdle()
-// should consolidate.
 void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_array_t& obj_item_array)
 {
 	// Build a compound message to send all the objects that need to be rezzed.
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 258d69d546..5e51758ac6 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3935,7 +3935,7 @@ void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
 						<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 
-	if (mAttachmentInvLinkEnabled)
+	if (mAttachmentInvLinkEnabled && isLinkedInCOF(item_id))
 	{
 		LL_DEBUGS("Avatar") << "ATT removing COF link for attachment "
 							<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index cc83500491..b00ccd2d40 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llattachmentsmgr.h"
 
+#include "llvoavatarself.h"
 #include "llagent.h"
 #include "llappearancemgr.h"
 #include "llinventorymodel.h"
@@ -35,6 +36,9 @@
 #include "llviewerregion.h"
 #include "message.h"
 
+const F32 COF_LINK_BATCH_TIME = 5.0F;
+const F32 MAX_ATTACHMENT_REQUEST_LIFETIME = 30.0F;
+const F32 MIN_RETRY_REQUEST_TIME = 5.0F;
 
 LLAttachmentsMgr::LLAttachmentsMgr()
 {
@@ -49,6 +53,14 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
                                             const BOOL add)
 {
 	LLViewerInventoryItem *item = gInventory.getItem(item_id);
+
+    if (attachmentWasRequestedRecently(item_id))
+    {
+        LL_DEBUGS("Avatar") << "ATT not adding attachment to mPendingAttachments, recent request is already pending: "
+                            << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+        return;
+    }
+
 	LL_DEBUGS("Avatar") << "ATT adding attachment to mPendingAttachments "
 						<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
 
@@ -78,42 +90,9 @@ void LLAttachmentsMgr::onIdle()
 	requestPendingAttachments();
 
     linkRecentlyArrivedAttachments();
-}
-
-class LLAttachAfterLinkCallback: public LLInventoryCallback
-{
-public:
-	LLAttachAfterLinkCallback(const LLAttachmentsMgr::attachments_vec_t& to_link_and_attach):
-		mToLinkAndAttach(to_link_and_attach)
-	{
-	}
-
-	~LLAttachAfterLinkCallback()
-	{
-		LL_DEBUGS("Avatar") << "destructor" << LL_ENDL; 
-		for (LLAttachmentsMgr::attachments_vec_t::const_iterator it = mToLinkAndAttach.begin();
-			 it != mToLinkAndAttach.end(); ++it)
-		{
-			const LLAttachmentsMgr::AttachmentsInfo& att_info = *it;
-			if (!LLAppearanceMgr::instance().isLinkedInCOF(att_info.mItemID))
-			{
-				LLViewerInventoryItem *item = gInventory.getItem(att_info.mItemID);
-				LL_WARNS() << "ATT COF link creation failed for att item " << (item ? item->getName() : "UNKNOWN") << " id "
-						   << att_info.mItemID << LL_ENDL;
-			}
-		}
-		LLAppearanceMgr::instance().requestServerAppearanceUpdate();
-		LLAttachmentsMgr::instance().requestAttachments(mToLinkAndAttach);
-	}
-
-	/* virtual */ void fire(const LLUUID& inv_item)
-	{
-		LL_DEBUGS("Avatar") << inv_item << LL_ENDL;
-	}
 
-private:
-	LLAttachmentsMgr::attachments_vec_t mToLinkAndAttach;
-};
+    expireOldAttachmentRequests();
+}
 
 void LLAttachmentsMgr::requestPendingAttachments()
 {
@@ -124,53 +103,10 @@ void LLAttachmentsMgr::requestPendingAttachments()
 	}
 }
 
-void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
-{
-    const F32 COF_LINK_BATCH_TIME = 5.0F;
-    
-    // One or more attachments have arrived but not been processed for COF links
-    if (mRecentlyArrivedAttachments.size())
-    {
-        if (mAttachmentRequests.empty())
-        {
-            // Not waiting for more
-            LL_DEBUGS("Avatar") << "ATT all pending attachments have arrived" << LL_ENDL;
-        }
-        else if (mCOFLinkBatchTimer.getElapsedTimeF32() > COF_LINK_BATCH_TIME)
-        {
-            LL_DEBUGS("Avatar") << mAttachmentRequests.size()
-                                << "ATT pending attachments have not arrived but wait time exceeded" << LL_ENDL;
-        }
-        else
-        {
-            return;
-        }
-
-        LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mRecentlyArrivedAttachments.size() << LL_ENDL;
-		LLInventoryObject::const_object_list_t inv_items_to_link;
-        for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
-             it != mRecentlyArrivedAttachments.end(); ++it)
-        {
-            if (!LLAppearanceMgr::instance().isLinkedInCOF(*it))
-            {
-                LLUUID item_id = *it;
-                LLViewerInventoryItem *item = gInventory.getItem(item_id);
-                LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
-                                    << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
-                inv_items_to_link.push_back(item);
-            }
-        }
-        if (inv_items_to_link.size())
-        {
-            LLPointer<LLInventoryCallback> cb = new LLRequestServerAppearanceUpdateOnDestroy();
-            link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
-        }
-        mRecentlyArrivedAttachments.clear();
-    }
-}
-
-// FIXME this is basically the same code as LLAgentWearables::userAttachMultipleAttachments(),
-// should consolidate.
+// Send request(s) for a group of attachments. As coded, this can
+// request at most 40 attachments and the rest will be
+// ignored. Currently the max attachments per avatar is 38, so the 40
+// limit should not be hit in practice.
 void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_requests)
 {
 	// Make sure we got a region before trying anything else
@@ -184,8 +120,6 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	{
 		return;
 	}
-	LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple from attachment_requests,"
-		" total obj_count " << obj_count << LL_ENDL;
 
 	// Limit number of packets to send
 	const S32 MAX_PACKETS_TO_SEND = 10;
@@ -193,9 +127,16 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
 	if( obj_count > MAX_OBJECTS_TO_SEND )
 	{
+        LL_WARNS() << "Too many attachments requested: " << attachment_requests.size()
+                   << " exceeds limit of " << MAX_OBJECTS_TO_SEND << LL_ENDL;
+        LL_WARNS() << "Excess requests will be ignored" << LL_ENDL;
+
 		obj_count = MAX_OBJECTS_TO_SEND;
 	}
 
+	LL_DEBUGS("Avatar") << "ATT [RezMultipleAttachmentsFromInv] attaching multiple from attachment_requests,"
+		" total obj_count " << obj_count << LL_ENDL;
+
 	LLUUID compound_msg_id;
 	compound_msg_id.generate();
 	LLMessageSystem* msg = gMessageSystem;
@@ -249,6 +190,52 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	}
 }
 
+void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
+{
+    if (mRecentlyArrivedAttachments.size())
+    {
+        // One or more attachments have arrived but have not yet been
+        // processed for COF links
+        if (mAttachmentRequests.empty())
+        {
+            // Not waiting for any more.
+            LL_DEBUGS("Avatar") << "ATT all pending attachments have arrived after "
+                                << mCOFLinkBatchTimer.getElapsedTimeF32() << " seconds" << LL_ENDL;
+        }
+        else if (mCOFLinkBatchTimer.getElapsedTimeF32() > COF_LINK_BATCH_TIME)
+        {
+            LL_DEBUGS("Avatar") << "ATT " << mAttachmentRequests.size()
+                                << " pending attachments have not arrived, but wait time exceeded" << LL_ENDL;
+        }
+        else
+        {
+            return;
+        }
+
+        LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size() << " recently arrived items" << LL_ENDL;
+		LLInventoryObject::const_object_list_t inv_items_to_link;
+        for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
+             it != mRecentlyArrivedAttachments.end(); ++it)
+        {
+            if (gAgentAvatarp->isWearingAttachment(*it) &&
+                !LLAppearanceMgr::instance().isLinkedInCOF(*it))
+            {
+                LLUUID item_id = *it;
+                LLViewerInventoryItem *item = gInventory.getItem(item_id);
+                LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
+                                    << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
+                inv_items_to_link.push_back(item);
+            }
+        }
+        if (inv_items_to_link.size())
+        {
+            LLPointer<LLInventoryCallback> cb = new LLRequestServerAppearanceUpdateOnDestroy();
+            link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
+        }
+        mRecentlyArrivedAttachments.clear();
+    }
+}
+
 void LLAttachmentsMgr::addAttachmentRequestTime(const LLUUID& inv_item_id)
 {
     LLInventoryItem *item = gInventory.getItem(inv_item_id);
@@ -264,17 +251,17 @@ void LLAttachmentsMgr::removeAttachmentRequestTime(const LLUUID& inv_item_id)
 	mAttachmentRequests.erase(inv_item_id);
 }
 
-BOOL LLAttachmentsMgr::attachmentWasRequestedRecently(const LLUUID& inv_item_id, F32 seconds) const
+BOOL LLAttachmentsMgr::attachmentWasRequestedRecently(const LLUUID& inv_item_id) const
 {
 	std::map<LLUUID,LLTimer>::const_iterator it = mAttachmentRequests.find(inv_item_id);
 	if (it != mAttachmentRequests.end())
 	{
 		const LLTimer& request_time = it->second;
 		F32 request_time_elapsed = request_time.getElapsedTimeF32();
-		if (request_time_elapsed > seconds)
+		if (request_time_elapsed > MIN_RETRY_REQUEST_TIME)
 		{
             LLInventoryItem *item = gInventory.getItem(inv_item_id);
-            LL_DEBUGS("Avatar") << "ATT time ignored, exceeded " << seconds
+            LL_DEBUGS("Avatar") << "ATT time ignored, exceeded " << MIN_RETRY_REQUEST_TIME
                                 << " " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
 			return FALSE;
 		}
@@ -289,11 +276,37 @@ BOOL LLAttachmentsMgr::attachmentWasRequestedRecently(const LLUUID& inv_item_id,
 	}
 }
 
+// If we've been waiting for an attachment a long time, we want to
+// forget the request, because if the request is invalid (say the
+// object does not exist), the existence of a request that never goes
+// away will gum up the COF batch logic, causing it to always wait for
+// the timeout. Expiring a request means if the item does show up
+// late, the COF link request may not get properly batched up, but
+// behavior will be no worse than before we had the batching mechanism
+// in place; the COF link will still be created, but extra
+// requestServerAppearanceUpdate() calls may occur.
+void LLAttachmentsMgr::expireOldAttachmentRequests()
+{
+	for (std::map<LLUUID,LLTimer>::iterator it = mAttachmentRequests.begin();
+         it != mAttachmentRequests.end(); )
+    {
+        std::map<LLUUID,LLTimer>::iterator curr_it = it;
+        ++it;
+        if (it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
+        {
+            mAttachmentRequests.erase(curr_it);
+        }
+    }
+}
+
+// When an attachment arrives, we want to stop waiting for it, and add
+// it to the set of recently arrived items.
 void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
     removeAttachmentRequestTime(inv_item_id);
     if (mRecentlyArrivedAttachments.empty())
     {
+        // Start the timer for sending off a COF link batch.
         mCOFLinkBatchTimer.reset();
     }
     mRecentlyArrivedAttachments.insert(inv_item_id);
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index c84229475a..4f9efb272f 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -32,23 +32,38 @@
 
 class LLViewerInventoryItem;
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//--------------------------------------------------------------------------------
 // LLAttachmentsMgr
 // 
-// The sole purpose of this class is to take attachment
-// requests, queue them up, and send them all at once.
-// This handles situations where the viewer may request
-// a bunch of attachments at once in a short period of
-// time, where each of the requests would normally be
-// sent as a separate message versus being batched into
-// one single message.
-// 
-// The intent of this batching is to reduce viewer->server
-// traffic.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// This class manages batching up of requests at two stages of
+// attachment rezzing.
+//
+// First, attachments requested to rez get saved in
+// mPendingAttachments and sent as a single
+// RezMultipleAttachmentsFromInv request. This batching is needed
+// mainly because of weaknessing the UI element->inventory item
+// handling, such that we don't always know when we are requesting
+// multiple items. Now they just pile up and get swept into a single
+// request during the idle loop.
+//
+// Second, after attachments arrive, we need to generate COF links for
+// them. There are both efficiency and UI correctness reasons why it
+// is better to request all the COF links at once and run a single
+// callback after they all complete. Given the vagaries of the
+// attachment system, there is no guarantee that we will get all the
+// attachments we ask for, but we frequently do. So in the common case
+// that all the desired attachments arrive fairly quickly, we generate
+// a single batched request for COF links. If attachments arrive late
+// or not at all, we will still issue COF link requests once a timeout
+// value has been exceeded.
+//
+// To handle attachments that never arrive, we forget about requests
+// that exceed a timeout value.
+//--------------------------------------------------------------------------------
 class LLAttachmentsMgr: public LLSingleton<LLAttachmentsMgr>
 {
 public:
+    // Stores info for attachments that will be requested during idle.
 	struct AttachmentsInfo
 	{
 		LLUUID mItemID;
@@ -66,7 +81,7 @@ public:
 	void requestAttachments(const attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
 
-	BOOL attachmentWasRequestedRecently(const LLUUID& inv_item_id, F32 seconds) const;
+	BOOL attachmentWasRequestedRecently(const LLUUID& inv_item_id) const;
 	void addAttachmentRequestTime(const LLUUID& inv_item_id);
     void onAttachmentArrived(const LLUUID& inv_item_id);
 
@@ -75,6 +90,7 @@ private:
 	void onIdle();
 	void requestPendingAttachments();
 	void linkRecentlyArrivedAttachments();
+    void expireOldAttachmentRequests();
 
     // Attachments that we are planning to rez but haven't requested from the server yet.
 	attachments_vec_t mPendingAttachments;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index e44de6f91e..bab86bc2e5 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5367,10 +5367,8 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
 	const LLUUID& item_id = item->getLinkedUUID();
 
 	// Check for duplicate request.
-	const F32 MAX_TIME_SINCE_REQUEST = 5.0F;
 	if (isAgentAvatarValid() &&
-		(LLAttachmentsMgr::instance().attachmentWasRequestedRecently(item_id, MAX_TIME_SINCE_REQUEST) ||
-		 gAgentAvatarp->isWearingAttachment(item_id)))
+		gAgentAvatarp->isWearingAttachment(item_id))
 	{
 		LL_WARNS() << "ATT duplicate attachment request, ignoring" << LL_ENDL;
 		return;
-- 
cgit v1.3


From 779d5ac56e539638d11c80ad6ab5e56b86b0bcb3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 19 Mar 2015 17:38:57 -0400
Subject: MAINT-4917 WIP - debug line added.

---
 indra/newview/llattachmentsmgr.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index b00ccd2d40..285824f261 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -294,6 +294,8 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
         ++it;
         if (it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
         {
+            LL_DEBUGS("Avatar") << "ATT expiring request for attachment item_id " << curr_it->first
+                                << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
             mAttachmentRequests.erase(curr_it);
         }
     }
-- 
cgit v1.3


From 6fc663d62ad847a6b91029ce9576058cd01a3d68 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 20 Mar 2015 11:03:47 -0400
Subject: DRTVWR-397 WIP - logging for detach requests and unexpected detaches
 (presumably server-initiated)

---
 indra/newview/llagentwearables.cpp |  1 +
 indra/newview/llappearancemgr.cpp  |  1 +
 indra/newview/llattachmentsmgr.cpp | 95 +++++++++++++++++++++++++++-----------
 indra/newview/llattachmentsmgr.h   | 26 +++++++++--
 4 files changed, 92 insertions(+), 31 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 4d46a331c8..d772e1c7f8 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1362,6 +1362,7 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo
 		const LLUUID& item_id = objectp->getAttachmentItemID();
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
 		LL_DEBUGS("Avatar") << "ATT removing object, item is " << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
+        LLAttachmentsMgr::instance().onDetachRequested(item_id);
 	}
 	gMessageSystem->sendReliable(gAgent.getRegionHost());
 }
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 5e51758ac6..a94aa37ab7 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3935,6 +3935,7 @@ void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
 						<< (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
 	gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 
+    LLAttachmentsMgr::instance().onDetachCompleted(item_id);
 	if (mAttachmentInvLinkEnabled && isLinkedInCOF(item_id))
 	{
 		LL_DEBUGS("Avatar") << "ATT removing COF link for attachment "
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 285824f261..6b8f7044cd 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -40,7 +40,9 @@ const F32 COF_LINK_BATCH_TIME = 5.0F;
 const F32 MAX_ATTACHMENT_REQUEST_LIFETIME = 30.0F;
 const F32 MIN_RETRY_REQUEST_TIME = 5.0F;
 
-LLAttachmentsMgr::LLAttachmentsMgr()
+LLAttachmentsMgr::LLAttachmentsMgr():
+    mAttachmentRequests("attach",MIN_RETRY_REQUEST_TIME),
+    mDetachRequests("detach",MIN_RETRY_REQUEST_TIME)
 {
 }
 
@@ -54,7 +56,7 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
 {
 	LLViewerInventoryItem *item = gInventory.getItem(item_id);
 
-    if (attachmentWasRequestedRecently(item_id))
+    if (mAttachmentRequests.wasRequestedRecently(item_id))
     {
         LL_DEBUGS("Avatar") << "ATT not adding attachment to mPendingAttachments, recent request is already pending: "
                             << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
@@ -70,7 +72,7 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
 	attachment.mAdd = add;
 	mPendingAttachments.push_back(attachment);
 
-    addAttachmentRequestTime(item_id);
+    mAttachmentRequests.addTime(item_id);
 }
 
 // static
@@ -212,7 +214,8 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
             return;
         }
 
-        LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size() << " recently arrived items" << LL_ENDL;
+        LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size()
+                            << " recently arrived items" << LL_ENDL;
 		LLInventoryObject::const_object_list_t inv_items_to_link;
         for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
              it != mRecentlyArrivedAttachments.end(); ++it)
@@ -236,44 +239,57 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
     }
 }
 
-void LLAttachmentsMgr::addAttachmentRequestTime(const LLUUID& inv_item_id)
+LLAttachmentsMgr::LLItemRequestTimes::LLItemRequestTimes(const std::string& op_name, F32 timeout):
+    mOpName(op_name),
+    mTimeout(timeout)
+{
+}
+
+void LLAttachmentsMgr::LLItemRequestTimes::addTime(const LLUUID& inv_item_id)
 {
     LLInventoryItem *item = gInventory.getItem(inv_item_id);
-    LL_DEBUGS("Avatar") << "ATT add request time " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+    LL_DEBUGS("Avatar") << "ATT " << mOpName << " adding request time " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
 	LLTimer current_time;
-	mAttachmentRequests[inv_item_id] = current_time;
+	(*this)[inv_item_id] = current_time;
 }
 
-void LLAttachmentsMgr::removeAttachmentRequestTime(const LLUUID& inv_item_id)
+void LLAttachmentsMgr::LLItemRequestTimes::removeTime(const LLUUID& inv_item_id)
 {
     LLInventoryItem *item = gInventory.getItem(inv_item_id);
-    LL_DEBUGS("Avatar") << "ATT remove request time " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
-	mAttachmentRequests.erase(inv_item_id);
+    LL_DEBUGS("Avatar") << "ATT " << mOpName << " removing request time "
+                        << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+	(*this).erase(inv_item_id);
 }
 
-BOOL LLAttachmentsMgr::attachmentWasRequestedRecently(const LLUUID& inv_item_id) const
+BOOL LLAttachmentsMgr::LLItemRequestTimes::getTime(const LLUUID& inv_item_id, LLTimer& timer) const
 {
-	std::map<LLUUID,LLTimer>::const_iterator it = mAttachmentRequests.find(inv_item_id);
-	if (it != mAttachmentRequests.end())
+	std::map<LLUUID,LLTimer>::const_iterator it = (*this).find(inv_item_id);
+	if (it != (*this).end())
 	{
-		const LLTimer& request_time = it->second;
+        timer = it->second;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+BOOL LLAttachmentsMgr::LLItemRequestTimes::wasRequestedRecently(const LLUUID& inv_item_id) const
+{
+    LLTimer request_time;
+    if (getTime(inv_item_id, request_time))
+    {
 		F32 request_time_elapsed = request_time.getElapsedTimeF32();
-		if (request_time_elapsed > MIN_RETRY_REQUEST_TIME)
+		if (request_time_elapsed >= mTimeout)
 		{
             LLInventoryItem *item = gInventory.getItem(inv_item_id);
-            LL_DEBUGS("Avatar") << "ATT time ignored, exceeded " << MIN_RETRY_REQUEST_TIME
+            LL_DEBUGS("Avatar") << "ATT " << mOpName << " request time ignored, exceeded " << mTimeout
                                 << " " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-	else
-	{
-		return FALSE;
-	}
+        }
+        return request_time_elapsed < mTimeout;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
 // If we've been waiting for an attachment a long time, we want to
@@ -305,7 +321,7 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
 // it to the set of recently arrived items.
 void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
-    removeAttachmentRequestTime(inv_item_id);
+    mAttachmentRequests.removeTime(inv_item_id);
     if (mRecentlyArrivedAttachments.empty())
     {
         // Start the timer for sending off a COF link batch.
@@ -313,3 +329,26 @@ void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
     }
     mRecentlyArrivedAttachments.insert(inv_item_id);
 }
+
+void LLAttachmentsMgr::onDetachRequested(const LLUUID& inv_item_id)
+{
+    mDetachRequests.addTime(inv_item_id);
+}
+
+void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
+{
+    LLTimer timer;
+    LLInventoryItem *item = gInventory.getItem(inv_item_id);
+    if (mDetachRequests.getTime(inv_item_id, timer))
+    {
+        LL_DEBUGS("Avatar") << "ATT detach completed after " << timer.getElapsedTimeF32()
+                            << " seconds for " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+        mDetachRequests.removeTime(inv_item_id);
+    }
+    else
+    {
+        LL_WARNS("Avatar") << "ATT unexpected detach for "
+                           << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
+    }
+
+}
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index 4f9efb272f..2834c10a2f 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -81,11 +81,27 @@ public:
 	void requestAttachments(const attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
 
-	BOOL attachmentWasRequestedRecently(const LLUUID& inv_item_id) const;
-	void addAttachmentRequestTime(const LLUUID& inv_item_id);
     void onAttachmentArrived(const LLUUID& inv_item_id);
 
+    void onDetachRequested(const LLUUID& inv_item_id);
+    void onDetachCompleted(const LLUUID& inv_item_id);
+
 private:
+
+    class LLItemRequestTimes: public std::map<LLUUID,LLTimer>
+    {
+    public:
+        LLItemRequestTimes(const std::string& op_name, F32 timeout);
+        void addTime(const LLUUID& inv_item_id);
+        void removeTime(const LLUUID& inv_item_id);
+        BOOL wasRequestedRecently(const LLUUID& item_id) const;
+        BOOL getTime(const LLUUID& inv_item_id, LLTimer& timer) const;
+
+    private:
+        F32 mTimeout;
+        std::string mOpName;
+    };
+
 	void removeAttachmentRequestTime(const LLUUID& inv_item_id);
 	void onIdle();
 	void requestPendingAttachments();
@@ -96,11 +112,15 @@ private:
 	attachments_vec_t mPendingAttachments;
 
 	// Attachments that have been requested from server but have not arrived yet.
-	std::map<LLUUID,LLTimer> mAttachmentRequests;
+	LLItemRequestTimes mAttachmentRequests;
+
+    // Attachments that have been requested to detach but have not gone away yet.
+	LLItemRequestTimes mDetachRequests;
 
     // Attachments that have arrived but have not been linked in the COF yet.
     std::set<LLUUID> mRecentlyArrivedAttachments;
     LLTimer mCOFLinkBatchTimer;
+
 };
 
 #endif
-- 
cgit v1.3


From 81f9c81fe7caa8fceff4438a4c4b99f975c4f0de Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 20 Mar 2015 11:27:47 -0400
Subject: DRTVWR-397 WIP - ATT logging

---
 indra/newview/llattachmentsmgr.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 6b8f7044cd..fa2d95a1e6 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -129,9 +129,9 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
 	if( obj_count > MAX_OBJECTS_TO_SEND )
 	{
-        LL_WARNS() << "Too many attachments requested: " << attachment_requests.size()
+        LL_WARNS() << "ATT Too many attachments requested: " << attachment_requests.size()
                    << " exceeds limit of " << MAX_OBJECTS_TO_SEND << LL_ENDL;
-        LL_WARNS() << "Excess requests will be ignored" << LL_ENDL;
+        LL_WARNS() << "ATT Excess requests will be ignored" << LL_ENDL;
 
 		obj_count = MAX_OBJECTS_TO_SEND;
 	}
@@ -310,7 +310,9 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
         ++it;
         if (it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
         {
-            LL_DEBUGS("Avatar") << "ATT expiring request for attachment item_id " << curr_it->first
+            LLInventoryItem *item = gInventory.getItem(curr_it->first);
+            LL_DEBUGS("Avatar") << "ATT expiring request for attachment "
+                                << (item ? item->getName() : "UNKNOWN") << "item_id " << curr_it->first
                                 << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
             mAttachmentRequests.erase(curr_it);
         }
@@ -321,6 +323,13 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
 // it to the set of recently arrived items.
 void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
+    LLTimer timer;
+    if (!mAttachmentRequests.getTime(inv_item_id, timer))
+    {
+        LLInventoryItem *item = gInventory.getItem(inv_item_id);
+        LL_WARNS() << "ATT Attachment was unexpected or arrived after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds: "
+                   << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
+    }
     mAttachmentRequests.removeTime(inv_item_id);
     if (mRecentlyArrivedAttachments.empty())
     {
@@ -347,8 +356,7 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
     }
     else
     {
-        LL_WARNS("Avatar") << "ATT unexpected detach for "
-                           << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
+        LL_WARNS() << "ATT unexpected detach for "
+                   << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
-
 }
-- 
cgit v1.3


From b40bdb266a2525517ca509ca05c89ac4e46dc367 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 31 Mar 2015 14:18:49 -0400
Subject: DRTVWR-397 WIP - logging updates and fixes

---
 indra/newview/llattachmentsmgr.cpp | 24 ++++++++++++++++++++++--
 indra/newview/llattachmentsmgr.h   |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index fa2d95a1e6..ae9560211f 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -94,6 +94,8 @@ void LLAttachmentsMgr::onIdle()
     linkRecentlyArrivedAttachments();
 
     expireOldAttachmentRequests();
+
+    expireOldDetachRequests();
 }
 
 void LLAttachmentsMgr::requestPendingAttachments()
@@ -308,17 +310,35 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
     {
         std::map<LLUUID,LLTimer>::iterator curr_it = it;
         ++it;
-        if (it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
+        if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
         {
             LLInventoryItem *item = gInventory.getItem(curr_it->first);
             LL_DEBUGS("Avatar") << "ATT expiring request for attachment "
-                                << (item ? item->getName() : "UNKNOWN") << "item_id " << curr_it->first
+                                << (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
                                 << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
             mAttachmentRequests.erase(curr_it);
         }
     }
 }
 
+void LLAttachmentsMgr::expireOldDetachRequests()
+{
+	for (std::map<LLUUID,LLTimer>::iterator it = mDetachRequests.begin();
+         it != mDetachRequests.end(); )
+    {
+        std::map<LLUUID,LLTimer>::iterator curr_it = it;
+        ++it;
+        if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
+        {
+            LLInventoryItem *item = gInventory.getItem(curr_it->first);
+            LL_DEBUGS("Avatar") << "ATT expiring request for detach "
+                                << (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
+                                << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
+            mDetachRequests.erase(curr_it);
+        }
+    }
+}
+
 // When an attachment arrives, we want to stop waiting for it, and add
 // it to the set of recently arrived items.
 void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index 2834c10a2f..ae678b4007 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -107,6 +107,7 @@ private:
 	void requestPendingAttachments();
 	void linkRecentlyArrivedAttachments();
     void expireOldAttachmentRequests();
+    void expireOldDetachRequests();
 
     // Attachments that we are planning to rez but haven't requested from the server yet.
 	attachments_vec_t mPendingAttachments;
-- 
cgit v1.3


From f1684cdea5e1086b1127993eac9a5a7b4e47321a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 2 Apr 2015 17:47:22 -0400
Subject: DRTVWR-397 WIP - more logging

---
 indra/newview/llattachmentsmgr.cpp   | 25 +++++++++++++++++++------
 indra/newview/llviewermessage.cpp    |  2 +-
 indra/newview/llviewerobject.cpp     |  5 +++++
 indra/newview/llviewerobjectlist.cpp | 12 ++++++------
 indra/newview/llvoavatar.cpp         | 14 +++++++++++---
 5 files changed, 42 insertions(+), 16 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index ae9560211f..50f5efca25 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -258,9 +258,12 @@ void LLAttachmentsMgr::LLItemRequestTimes::addTime(const LLUUID& inv_item_id)
 void LLAttachmentsMgr::LLItemRequestTimes::removeTime(const LLUUID& inv_item_id)
 {
     LLInventoryItem *item = gInventory.getItem(inv_item_id);
-    LL_DEBUGS("Avatar") << "ATT " << mOpName << " removing request time "
-                        << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
-	(*this).erase(inv_item_id);
+	S32 remove_count = (*this).erase(inv_item_id);
+    if (remove_count)
+    {
+        LL_DEBUGS("Avatar") << "ATT " << mOpName << " removing request time "
+                            << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+    }
 }
 
 BOOL LLAttachmentsMgr::LLItemRequestTimes::getTime(const LLUUID& inv_item_id, LLTimer& timer) const
@@ -313,7 +316,7 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
         if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
         {
             LLInventoryItem *item = gInventory.getItem(curr_it->first);
-            LL_DEBUGS("Avatar") << "ATT expiring request for attachment "
+            LL_WARNS("Avatar") << "ATT expiring request for attachment "
                                 << (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
                                 << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
             mAttachmentRequests.erase(curr_it);
@@ -331,7 +334,7 @@ void LLAttachmentsMgr::expireOldDetachRequests()
         if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
         {
             LLInventoryItem *item = gInventory.getItem(curr_it->first);
-            LL_DEBUGS("Avatar") << "ATT expiring request for detach "
+            LL_WARNS("Avatar") << "ATT expiring request for detach "
                                 << (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
                                 << " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
             mDetachRequests.erase(curr_it);
@@ -344,13 +347,19 @@ void LLAttachmentsMgr::expireOldDetachRequests()
 void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
     LLTimer timer;
-    if (!mAttachmentRequests.getTime(inv_item_id, timer))
+    bool expected = mAttachmentRequests.getTime(inv_item_id, timer);
+    if (!expected)
     {
         LLInventoryItem *item = gInventory.getItem(inv_item_id);
         LL_WARNS() << "ATT Attachment was unexpected or arrived after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds: "
                    << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
     mAttachmentRequests.removeTime(inv_item_id);
+    if (expected && mAttachmentRequests.empty())
+    {
+        // mAttachmentRequests just emptied out
+        LL_DEBUGS("Avatar") << "ATT all active attachment requests have completed" << LL_ENDL;
+    }
     if (mRecentlyArrivedAttachments.empty())
     {
         // Start the timer for sending off a COF link batch.
@@ -373,6 +382,10 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
         LL_DEBUGS("Avatar") << "ATT detach completed after " << timer.getElapsedTimeF32()
                             << " seconds for " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
         mDetachRequests.removeTime(inv_item_id);
+        if (mDetachRequests.empty())
+        {
+            LL_DEBUGS("Avatar") << "ATT all detach requests have completed" << LL_ENDL;
+        }
     }
     else
     {
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 44eb4361f1..5bc4ec699a 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4656,7 +4656,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
 		LLViewerObjectList::getUUIDFromLocal(id, local_id, ip, port); 
 		if (id == LLUUID::null)
 		{
-			LL_DEBUGS("Messaging") << "Unknown kill for local " << local_id << LL_ENDL;
+			LL_WARNS("Messaging") << "ATT? Unknown kill for local " << local_id << LL_ENDL;
 			continue;
 		}
 		else
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 74b8e693c4..87063edec3 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1958,6 +1958,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 				
 				if (sent_parentp && (sent_parentp != this) && !sent_parentp->isDead())
 				{
+                    if (((LLViewerObject*)sent_parentp)->isAvatar())
+                    {
+                        //LL_DEBUGS("Avatar") << "ATT got object update for attachment " << LL_ENDL; 
+                    }
+                    
 					//
 					// We have a viewer object for the parent, and it's not dead.
 					// Do the actual reparenting here.
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 7c36b30dd1..7951503187 100755
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -474,13 +474,13 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			{
 				U32 flags = 0;
 				mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, i);
-			
+                
 				if(flags & FLAGS_TEMPORARY_ON_REZ)
 				{
-				compressed_dp.unpackUUID(fullid, "ID");
-				compressed_dp.unpackU32(local_id, "LocalID");
-				compressed_dp.unpackU8(pcode, "PCode");
-			}
+                    compressed_dp.unpackUUID(fullid, "ID");
+                    compressed_dp.unpackU32(local_id, "LocalID");
+                    compressed_dp.unpackU8(pcode, "PCode");
+                }
 				else //send to object cache
 				{
 					regionp->cacheFullUpdate(compressed_dp, flags);
@@ -497,7 +497,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 								 gMessageSystem->getSenderPort());
 				if (fullid.isNull())
 				{
-					// LL_WARNS() << "update for unknown localid " << local_id << " host " << gMessageSystem->getSender() << ":" << gMessageSystem->getSenderPort() << LL_ENDL;
+					LL_WARNS() << "ATT? update for unknown localid " << local_id << " host " << gMessageSystem->getSender() << ":" << gMessageSystem->getSenderPort() << LL_ENDL;
 					mNumUnknownUpdates++;
 				}
 			}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bc76dec587..67cb4af5c0 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5725,12 +5725,20 @@ BOOL LLVOAvatar::setParent(LLViewerObject* parent)
 void LLVOAvatar::addChild(LLViewerObject *childp)
 {
 	childp->extractAttachmentItemID(); // find the inventory item this object is associated with.
+	if (isSelf())
+	{
+	    const LLUUID& item_id = childp->getAttachmentItemID();
+		LLViewerInventoryItem *item = gInventory.getItem(item_id);
+		LL_DEBUGS("Avatar") << "ATT attachment child added " << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+
+	}
+
 	LLViewerObject::addChild(childp);
 	if (childp->mDrawable)
 	{
 		if (!attachObject(childp))
 		{
-			LL_WARNS() << "addChild() failed for " 
+			LL_WARNS() << "ATT addChild() failed for " 
 					<< childp->getID()
 					<< " item " << childp->getAttachmentItemID()
 					<< LL_ENDL;
@@ -5813,8 +5821,8 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o
 	{
 		const LLUUID& item_id = viewer_object->getAttachmentItemID();
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
-		LL_DEBUGS("Avatar") << "ATT attach failed "
-							<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;	
+		LL_WARNS("Avatar") << "ATT attach failed "
+						   << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;	
 		return 0;
 	}
 
-- 
cgit v1.3


From 6ac9852d54d1ee4f826a08ca73f08bccf403d8c3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 9 Apr 2015 13:29:39 -0400
Subject: MAINT-5069 WIP, MAINT-5071 WIP - handle dropping objects and
 attaching from ground. WIP on better tracking of attachment requests via
 various message in LLSelectMgr.

---
 indra/newview/llappearancemgr.cpp   | 35 ++++++++-----------
 indra/newview/llattachmentsmgr.cpp  | 53 ++++++++++++++++++++++++++---
 indra/newview/llattachmentsmgr.h    |  2 ++
 indra/newview/llgesturemgr.cpp      | 14 --------
 indra/newview/llselectmgr.cpp       | 68 +++++++++++++++++++++++++++++--------
 indra/newview/llselectmgr.h         |  4 +++
 indra/newview/llviewerinventory.cpp | 10 +++++-
 indra/newview/llviewerinventory.h   |  4 +++
 indra/newview/llviewermenu.cpp      |  2 +-
 9 files changed, 138 insertions(+), 54 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index a94aa37ab7..c4dd71de89 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2650,28 +2650,23 @@ void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item,
 
 LLInventoryModel::item_array_t LLAppearanceMgr::findCOFItemLinks(const LLUUID& item_id)
 {
-
 	LLInventoryModel::item_array_t result;
-	const LLViewerInventoryItem *vitem =
-		dynamic_cast<const LLViewerInventoryItem*>(gInventory.getItem(item_id));
 
-	if (vitem)
-	{
-		LLInventoryModel::cat_array_t cat_array;
-		LLInventoryModel::item_array_t item_array;
-		gInventory.collectDescendents(LLAppearanceMgr::getCOF(),
-									  cat_array,
-									  item_array,
-									  LLInventoryModel::EXCLUDE_TRASH);
-		for (S32 i=0; i<item_array.size(); i++)
-		{
-			const LLViewerInventoryItem* inv_item = item_array.at(i).get();
-			if (inv_item->getLinkedUUID() == vitem->getLinkedUUID())
-			{
-				result.push_back(item_array.at(i));
-			}
-		}
-	}
+    LLUUID linked_id = get_linked_uuid(item_id);
+    LLInventoryModel::cat_array_t cat_array;
+    LLInventoryModel::item_array_t item_array;
+    gInventory.collectDescendents(LLAppearanceMgr::getCOF(),
+                                  cat_array,
+                                  item_array,
+                                  LLInventoryModel::EXCLUDE_TRASH);
+    for (S32 i=0; i<item_array.size(); i++)
+    {
+        const LLViewerInventoryItem* inv_item = item_array.at(i).get();
+        if (inv_item->getLinkedUUID() == linked_id)
+        {
+            result.push_back(item_array.at(i));
+        }
+    }
 	return result;
 }
 
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 50f5efca25..c9733d43b6 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -75,6 +75,14 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
     mAttachmentRequests.addTime(item_id);
 }
 
+void LLAttachmentsMgr::onAttachmentRequested(const LLUUID& item_id)
+{
+	LLViewerInventoryItem *item = gInventory.getItem(item_id);
+	LL_DEBUGS("Avatar") << "ATT attachment was requested "
+						<< (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+    mAttachmentRequests.addTime(item_id);
+}
+
 // static
 void LLAttachmentsMgr::onIdle(void *)
 {
@@ -96,6 +104,8 @@ void LLAttachmentsMgr::onIdle()
     expireOldAttachmentRequests();
 
     expireOldDetachRequests();
+
+    spamStatusInfo();
 }
 
 void LLAttachmentsMgr::requestPendingAttachments()
@@ -218,7 +228,8 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
 
         LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size()
                             << " recently arrived items" << LL_ENDL;
-		LLInventoryObject::const_object_list_t inv_items_to_link;
+
+        uuid_vec_t ids_to_link;
         for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
              it != mRecentlyArrivedAttachments.end(); ++it)
         {
@@ -229,13 +240,17 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
                 LLViewerInventoryItem *item = gInventory.getItem(item_id);
                 LL_DEBUGS("Avatar") << "ATT adding COF link for attachment "
                                     << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL;
-                inv_items_to_link.push_back(item);
+                ids_to_link.push_back(item_id);
             }
         }
-        if (inv_items_to_link.size())
+        if (ids_to_link.size())
         {
             LLPointer<LLInventoryCallback> cb = new LLRequestServerAppearanceUpdateOnDestroy();
-            link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb);
+            for (uuid_vec_t::const_iterator uuid_it = ids_to_link.begin();
+                 uuid_it != ids_to_link.end(); ++uuid_it)
+            {
+                LLAppearanceMgr::instance().addCOFItemLink(*uuid_it, cb);
+            }
         }
         mRecentlyArrivedAttachments.clear();
     }
@@ -393,3 +408,33 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
                    << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
 }
+
+void LLAttachmentsMgr::spamStatusInfo()
+{
+#if 0
+    static LLTimer spam_timer;
+    const F32 spam_frequency = 100.0F;
+
+    if (spam_timer.getElapsedTimeF32() > spam_frequency)
+    {
+        spam_timer.reset();
+        
+        LLInventoryModel::cat_array_t cat_array;
+        LLInventoryModel::item_array_t item_array;
+        gInventory.collectDescendents(LLAppearanceMgr::instance().getCOF(),
+                                      cat_array,item_array,LLInventoryModel::EXCLUDE_TRASH);
+        for (S32 i=0; i<item_array.size(); i++)
+        {
+            const LLViewerInventoryItem* inv_item = item_array.at(i).get();
+            if (inv_item->getType() == LLAssetType::AT_OBJECT)
+            {
+                LL_DEBUGS("Avatar") << "item_id: " << inv_item->getUUID()
+                                    << " linked_item_id: " << inv_item->getLinkedUUID()
+                                    << " name: " << inv_item->getName()
+                                    << " parent: " << inv_item->getParentUUID()
+                                    << LL_ENDL;
+            }
+        }
+    }
+#endif
+}
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index ae678b4007..b8d3adac0d 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -78,6 +78,7 @@ public:
 	void addAttachmentRequest(const LLUUID& item_id,
                               const U8 attachment_pt,
                               const BOOL add);
+    void onAttachmentRequested(const LLUUID& item_id);
 	void requestAttachments(const attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
 
@@ -108,6 +109,7 @@ private:
 	void linkRecentlyArrivedAttachments();
     void expireOldAttachmentRequests();
     void expireOldDetachRequests();
+    void spamStatusInfo();
 
     // Attachments that we are planning to rez but haven't requested from the server yet.
 	attachments_vec_t mPendingAttachments;
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 119872ec29..7ca36be76e 100755
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -59,10 +59,6 @@
 // Longest time, in seconds, to wait for all animations to stop playing
 const F32 MAX_WAIT_ANIM_SECS = 30.f;
 
-// If this gesture is a link, get the base gesture that this link points to,
-// otherwise just return this id.
-static const LLUUID& get_linked_uuid(const LLUUID& item_id);
-
 // Lightweight constructor.
 // init() does the heavy lifting.
 LLGestureMgr::LLGestureMgr()
@@ -1457,14 +1453,4 @@ void LLGestureMgr::done()
 	}
 }
 
-// static
-const LLUUID& get_linked_uuid(const LLUUID &item_id)
-{
-	LLViewerInventoryItem* item = gInventory.getItem(item_id);
-	if (item && item->getIsLinkType())
-	{
-		return item->getLinkedUUID();
-	}
-	return item_id;
-}
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index eb3a4c37d9..408d983bbd 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -52,6 +52,7 @@
 // viewer includes
 #include "llagent.h"
 #include "llagentcamera.h"
+#include "llattachmentsmgr.h"
 #include "llviewerwindow.h"
 #include "lldrawable.h"
 #include "llfloaterinspect.h"
@@ -2312,6 +2313,7 @@ void LLSelectMgr::selectionSetIncludeInSearch(bool include_in_search)
 		"ObjectIncludeInSearch",
 		packAgentAndSessionID,
 		packObjectIncludeInSearch, 
+        logNoOp,
 		&include_in_search,
 		SEND_ONLY_ROOTS);
 }
@@ -2361,6 +2363,7 @@ void LLSelectMgr::selectionSetClickAction(U8 action)
 	sendListToRegions("ObjectClickAction",
 					  packAgentAndSessionID,
 					  packObjectClickAction, 
+                      logNoOp,
 					  &action,
 					  SEND_INDIVIDUALS);
 }
@@ -2396,7 +2399,7 @@ void LLSelectMgr::sendGodlikeRequest(const std::string& request, const std::stri
 	}
 	else
 	{
-		sendListToRegions(message_type, packGodlikeHead, packObjectIDAsParam, &data, SEND_ONLY_ROOTS);
+		sendListToRegions(message_type, packGodlikeHead, packObjectIDAsParam, logNoOp, &data, SEND_ONLY_ROOTS);
 	}
 }
 
@@ -2424,6 +2427,23 @@ void LLSelectMgr::packGodlikeHead(void* user_data)
 	}
 }
 
+// static
+void LLSelectMgr::logNoOp(LLSelectNode* node, void *)
+{
+}
+
+// static
+void LLSelectMgr::logAttachmentRequest(LLSelectNode* node, void *)
+{
+    LLAttachmentsMgr::instance().onAttachmentRequested(node->mItemID);
+}
+
+// static
+void LLSelectMgr::logDetachRequest(LLSelectNode* node, void *)
+{
+    LLAttachmentsMgr::instance().onDetachRequested(node->mItemID);
+}
+
 // static
 void LLSelectMgr::packObjectIDAsParam(LLSelectNode* node, void *)
 {
@@ -3530,10 +3550,11 @@ bool LLSelectMgr::confirmDelete(const LLSD& notification, const LLSD& response,
 			// attempt to derez into the trash.
 			LLDeRezInfo info(DRD_TRASH, trash_id);
 			LLSelectMgr::getInstance()->sendListToRegions("DeRezObject",
-										  packDeRezHeader,
-										  packObjectLocalID,
-										  (void*) &info,
-										  SEND_ONLY_ROOTS);
+                                                          packDeRezHeader,
+                                                          packObjectLocalID,
+                                                          logNoOp,
+                                                          (void*) &info,
+                                                          SEND_ONLY_ROOTS);
 			// VEFFECT: Delete Object - one effect for all deletes
 			if (LLSelectMgr::getInstance()->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
 			{
@@ -3565,6 +3586,7 @@ void LLSelectMgr::selectForceDelete()
 		"ObjectDelete",
 		packDeleteHeader,
 		packObjectLocalID,
+        logNoOp,
 		(void*)TRUE,
 		SEND_ONLY_ROOTS);
 }
@@ -3735,7 +3757,7 @@ void LLSelectMgr::selectDuplicate(const LLVector3& offset, BOOL select_copy)
 	data.offset = offset;
 	data.flags = (select_copy ? FLAGS_CREATE_SELECTED : 0x0);
 
-	sendListToRegions("ObjectDuplicate", packDuplicateHeader, packDuplicate, &data, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectDuplicate", packDuplicateHeader, packDuplicate, logNoOp, &data, SEND_ONLY_ROOTS);
 
 	if (select_copy)
 	{
@@ -3790,7 +3812,7 @@ void LLSelectMgr::repeatDuplicate()
 	data.offset = LLVector3::zero;
 	data.flags = 0x0;
 
-	sendListToRegions("ObjectDuplicate", packDuplicateHeader, packDuplicate, &data, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectDuplicate", packDuplicateHeader, packDuplicate, logNoOp, &data, SEND_ONLY_ROOTS);
 
 	// move current selection based on delta from duplication position and update duplication position
 	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
@@ -3869,7 +3891,7 @@ void LLSelectMgr::selectDuplicateOnRay(const LLVector3 &ray_start_region,
 	data.mFlags				= (select_copy ? FLAGS_CREATE_SELECTED : 0x0);
 
 	sendListToRegions("ObjectDuplicateOnRay", 
-		packDuplicateOnRayHead, packObjectLocalID, &data, SEND_ONLY_ROOTS);
+                      packDuplicateOnRayHead, packObjectLocalID, logNoOp, &data, SEND_ONLY_ROOTS);
 
 	if (select_copy)
 	{
@@ -3919,6 +3941,7 @@ void LLSelectMgr::sendMultipleUpdate(U32 type)
 		"MultipleObjectUpdate",
 		packAgentAndSessionID,
 		packMultipleUpdate,
+        logNoOp,
 		&type,
 		send_type);
 }
@@ -3982,7 +4005,7 @@ void LLSelectMgr::sendOwner(const LLUUID& owner_id,
 	data.group_id = group_id;
 	data.override = override;
 
-	sendListToRegions("ObjectOwner", packOwnerHead, packObjectLocalID, &data, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectOwner", packOwnerHead, packObjectLocalID, logNoOp, &data, SEND_ONLY_ROOTS);
 }
 
 // static
@@ -4006,7 +4029,7 @@ void LLSelectMgr::packOwnerHead(void *user_data)
 void LLSelectMgr::sendGroup(const LLUUID& group_id)
 {
 	LLUUID local_group_id(group_id);
-	sendListToRegions("ObjectGroup", packAgentAndSessionAndGroupID, packObjectLocalID, &local_group_id, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectGroup", packAgentAndSessionAndGroupID, packObjectLocalID, logNoOp, &local_group_id, SEND_ONLY_ROOTS);
 }
 
 
@@ -4030,7 +4053,7 @@ void LLSelectMgr::sendBuy(const LLUUID& buyer_id, const LLUUID& category_id, con
 	LLBuyData buy;
 	buy.mCategoryID = category_id;
 	buy.mSaleInfo = sale_info;
-	sendListToRegions("ObjectBuy", packAgentGroupAndCatID, packBuyObjectIDs, &buy, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectBuy", packAgentGroupAndCatID, packBuyObjectIDs, logNoOp, &buy, SEND_ONLY_ROOTS);
 }
 
 // static
@@ -4074,7 +4097,7 @@ void LLSelectMgr::selectionSetObjectPermissions(U8 field,
 	data.mMask = mask;
 	data.mOverride = override;
 
-	sendListToRegions("ObjectPermissions", packPermissionsHead, packPermissions, &data, SEND_ONLY_ROOTS);
+	sendListToRegions("ObjectPermissions", packPermissionsHead, packPermissions, logNoOp, &data, SEND_ONLY_ROOTS);
 }
 
 void LLSelectMgr::packPermissionsHead(void* user_data)
@@ -4117,6 +4140,7 @@ void LLSelectMgr::deselectAll()
 		"ObjectDeselect",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logNoOp,
 		NULL,
 		SEND_INDIVIDUALS);
 
@@ -4147,6 +4171,7 @@ void LLSelectMgr::deselectAllForStandingUp()
 		"ObjectDeselect",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logNoOp,
 		NULL,
 		SEND_INDIVIDUALS);
 
@@ -4228,6 +4253,7 @@ void LLSelectMgr::selectionSetObjectName(const std::string& name)
 		sendListToRegions("ObjectName",
 						  packAgentAndSessionID,
 						  packObjectName,
+                          logNoOp,
 						  (void*)(&name_copy),
 						  SEND_ONLY_ROOTS);
 	}
@@ -4236,6 +4262,7 @@ void LLSelectMgr::selectionSetObjectName(const std::string& name)
 		sendListToRegions("ObjectName",
 						  packAgentAndSessionID,
 						  packObjectName,
+                          logNoOp,
 						  (void*)(&name_copy),
 						  SEND_INDIVIDUALS);
 	}
@@ -4251,6 +4278,7 @@ void LLSelectMgr::selectionSetObjectDescription(const std::string& desc)
 		sendListToRegions("ObjectDescription",
 						  packAgentAndSessionID,
 						  packObjectDescription,
+                          logNoOp,
 						  (void*)(&desc_copy),
 						  SEND_ONLY_ROOTS);
 	}
@@ -4259,6 +4287,7 @@ void LLSelectMgr::selectionSetObjectDescription(const std::string& desc)
 		sendListToRegions("ObjectDescription",
 						  packAgentAndSessionID,
 						  packObjectDescription,
+                          logNoOp,
 						  (void*)(&desc_copy),
 						  SEND_INDIVIDUALS);
 	}
@@ -4272,6 +4301,7 @@ void LLSelectMgr::selectionSetObjectCategory(const LLCategory& category)
 	sendListToRegions("ObjectCategory",
 					  packAgentAndSessionID,
 					  packObjectCategory,
+                      logNoOp,
 					  (void*)(&category),
 					  SEND_ONLY_ROOTS);
 }
@@ -4281,6 +4311,7 @@ void LLSelectMgr::selectionSetObjectSaleInfo(const LLSaleInfo& sale_info)
 	sendListToRegions("ObjectSaleInfo",
 					  packAgentAndSessionID,
 					  packObjectSaleInfo,
+                      logNoOp,
 					  (void*)(&sale_info),
 					  SEND_ONLY_ROOTS);
 }
@@ -4314,6 +4345,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point, bool replace)
 			"ObjectAttach",
 			packAgentIDAndSessionAndAttachment, 
 			packObjectIDAndRotation, 
+            logAttachmentRequest,
 			&attachment_point, 
 			SEND_ONLY_ROOTS );
 		if (!build_mode)
@@ -4334,6 +4366,7 @@ void LLSelectMgr::sendDetach()
 		"ObjectDetach",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logDetachRequest,
 		NULL,
 		SEND_ONLY_ROOTS );
 }
@@ -4350,6 +4383,7 @@ void LLSelectMgr::sendDropAttachment()
 		"ObjectDrop",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logDetachRequest,
 		NULL,
 		SEND_ONLY_ROOTS);
 }
@@ -4369,6 +4403,7 @@ void LLSelectMgr::sendLink()
 		"ObjectLink",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logNoOp,
 		NULL,
 		SEND_ONLY_ROOTS);
 }
@@ -4406,6 +4441,7 @@ void LLSelectMgr::sendDelink()
 		"ObjectDelink",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logNoOp,
 		NULL,
 		SEND_INDIVIDUALS);
 }
@@ -4458,6 +4494,7 @@ void LLSelectMgr::sendSelect()
 		"ObjectSelect",
 		packAgentAndSessionID,
 		packObjectLocalID,
+        logNoOp,
 		NULL,
 		SEND_INDIVIDUALS);
 }
@@ -4834,6 +4871,7 @@ void LLSelectMgr::packPermissions(LLSelectNode* node, void *user_data)
 void LLSelectMgr::sendListToRegions(const std::string& message_name,
 									void (*pack_header)(void *user_data), 
 									void (*pack_body)(LLSelectNode* node, void *user_data), 
+                                    void (*log_func)(LLSelectNode* node, void *user_data), 
 									void *user_data,
 									ESendType send_type)
 {
@@ -4955,6 +4993,8 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
 		{
 			// add another instance of the body of the data
 			(*pack_body)(node, user_data);
+            // do any related logging
+            (*log_func)(node, user_data);
 			++objects_sent;
 			++objects_in_this_packet;
 
@@ -6579,7 +6619,7 @@ void LLSelectMgr::undo()
 {
 	BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
 	LLUUID group_id(gAgent.getGroupID());
-	sendListToRegions("Undo", packAgentAndSessionAndGroupID, packObjectID, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
+	sendListToRegions("Undo", packAgentAndSessionAndGroupID, packObjectID, logNoOp, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
 }
 
 //-----------------------------------------------------------------------------
@@ -6597,7 +6637,7 @@ void LLSelectMgr::redo()
 {
 	BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
 	LLUUID group_id(gAgent.getGroupID());
-	sendListToRegions("Redo", packAgentAndSessionAndGroupID, packObjectID, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
+	sendListToRegions("Redo", packAgentAndSessionAndGroupID, packObjectID, logNoOp, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index a68328167a..a33ebbf8a7 100755
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -755,6 +755,7 @@ private:
 	void sendListToRegions(	const std::string& message_name,
 							void (*pack_header)(void *user_data), 
 							void (*pack_body)(LLSelectNode* node, void *user_data), 
+							void (*log_func)(LLSelectNode* node, void *user_data), 
 							void *user_data,
 							ESendType send_type);
 
@@ -790,6 +791,9 @@ private:
 	static void packHingeHead(void *user_data);
 	static void packPermissionsHead(void* user_data);
 	static void packGodlikeHead(void* user_data);
+    static void logNoOp(LLSelectNode* node, void *user_data);
+    static void logAttachmentRequest(LLSelectNode* node, void *user_data);
+    static void logDetachRequest(LLSelectNode* node, void *user_data);
 	static bool confirmDelete(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle handle);
 
 	// Get the first ID that matches test and whether or not all ids are identical in selected objects.
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index d6c8ba10f6..82da8a919b 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -2307,4 +2307,12 @@ BOOL LLViewerInventoryItem::regenerateLink()
 	return TRUE;
 }
 
-
+const LLUUID& get_linked_uuid(const LLUUID &item_id)
+{
+	LLViewerInventoryItem* item = gInventory.getItem(item_id);
+	if (item && item->getIsLinkType())
+	{
+		return item->getLinkedUUID();
+	}
+	return item_id;
+}
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index ca92565600..7823ebffb6 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -435,4 +435,8 @@ void slam_inventory_folder(const LLUUID& folder_id,
 void remove_folder_contents(const LLUUID& folder_id, bool keep_outfit_links,
 							  LLPointer<LLInventoryCallback> cb);
 
+// If item is in the InventoryModel and is a link, get the item
+// that this link points to. Otherwise just return this id.
+const LLUUID& get_linked_uuid(const LLUUID &item_id);
+
 #endif // LL_LLVIEWERINVENTORY_H
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a23d02a00a..0575da2901 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6620,7 +6620,7 @@ class LLAttachmentDetachFromPoint : public view_listener_t
 				LLViewerObject *attached_object = (*iter);
 				ids_to_remove.push_back(attached_object->getAttachmentItemID());
 			}
-			}
+        }
 		if (!ids_to_remove.empty())
 		{
 			LLAppearanceMgr::instance().removeItemsFromAvatar(ids_to_remove);
-- 
cgit v1.3


From 0e0339914f094a5f92eb1a2b8736979a848214e9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 10 Apr 2015 16:13:51 -0400
Subject: MAINT-5070 WIP, MAINT-4409 WIP - try to clean up invalid COF links
 under certain circumstances.

---
 indra/newview/llattachmentsmgr.cpp | 88 ++++++++++++++++++++++++++++++++++----
 indra/newview/llattachmentsmgr.h   |  3 ++
 2 files changed, 83 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index c9733d43b6..bbfcb6b955 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -39,10 +39,12 @@
 const F32 COF_LINK_BATCH_TIME = 5.0F;
 const F32 MAX_ATTACHMENT_REQUEST_LIFETIME = 30.0F;
 const F32 MIN_RETRY_REQUEST_TIME = 5.0F;
+const F32 MAX_BAD_COF_TIME = 30.0F;
 
 LLAttachmentsMgr::LLAttachmentsMgr():
     mAttachmentRequests("attach",MIN_RETRY_REQUEST_TIME),
-    mDetachRequests("detach",MIN_RETRY_REQUEST_TIME)
+    mDetachRequests("detach",MIN_RETRY_REQUEST_TIME),
+    mQuestionableCOFLinks("badcof",MAX_BAD_COF_TIME)
 {
 }
 
@@ -105,6 +107,8 @@ void LLAttachmentsMgr::onIdle()
 
     expireOldDetachRequests();
 
+    checkInvalidCOFLinks();
+    
     spamStatusInfo();
 }
 
@@ -233,7 +237,8 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
         for (std::set<LLUUID>::iterator it = mRecentlyArrivedAttachments.begin();
              it != mRecentlyArrivedAttachments.end(); ++it)
         {
-            if (gAgentAvatarp->isWearingAttachment(*it) &&
+            if (isAgentAvatarValid() &&
+                gAgentAvatarp->isWearingAttachment(*it) &&
                 !LLAppearanceMgr::instance().isLinkedInCOF(*it))
             {
                 LLUUID item_id = *it;
@@ -298,12 +303,6 @@ BOOL LLAttachmentsMgr::LLItemRequestTimes::wasRequestedRecently(const LLUUID& in
     if (getTime(inv_item_id, request_time))
     {
 		F32 request_time_elapsed = request_time.getElapsedTimeF32();
-		if (request_time_elapsed >= mTimeout)
-		{
-            LLInventoryItem *item = gInventory.getItem(inv_item_id);
-            LL_DEBUGS("Avatar") << "ATT " << mOpName << " request time ignored, exceeded " << mTimeout
-                                << " " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
-        }
         return request_time_elapsed < mTimeout;
     }
     else
@@ -407,6 +406,79 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
         LL_WARNS() << "ATT unexpected detach for "
                    << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
+
+    LL_DEBUGS("Avatar") << "ATT detached item flagging as questionable for COF link checking "
+                        << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
+    mQuestionableCOFLinks.addTime(inv_item_id);
+}
+
+// Check for attachments that are (a) linked in COF and (b) not
+// attached to the avatar.  This is a rotten function to have to
+// include, because it runs the risk of either repeatedly spamming out
+// COF link removals if they're failing for some reason, or getting
+// into a tug of war with some other sequence of events that's in the
+// process of adding the attachment in question. However, it's needed
+// because we have no definitive source of authority for what things
+// are actually supposed to be attached. Scripts, run on the server
+// side, can remove an attachment without our expecting it. If this
+// happens to an attachment that's just been added, then the COF link
+// creation may still be in flight, and we will have to delete the
+// link after it shows up.
+//
+// Note that we only flag items for possible link removal if they have
+// been previously detached. This means that an attachment failure
+// will leave the link in the COF, where it will hopefully resolve
+// correctly on relog.
+//
+// See related: MAINT-5070, MAINT-4409
+//
+void LLAttachmentsMgr::checkInvalidCOFLinks()
+{
+        LLInventoryModel::cat_array_t cat_array;
+        LLInventoryModel::item_array_t item_array;
+        gInventory.collectDescendents(LLAppearanceMgr::instance().getCOF(),
+                                      cat_array,item_array,LLInventoryModel::EXCLUDE_TRASH);
+        for (S32 i=0; i<item_array.size(); i++)
+        {
+            const LLViewerInventoryItem* inv_item = item_array.at(i).get();
+            const LLUUID& item_id = inv_item->getLinkedUUID();
+            if (inv_item->getType() == LLAssetType::AT_OBJECT)
+            {
+                LLTimer timer;
+                bool is_flagged_questionable = mQuestionableCOFLinks.getTime(item_id,timer);
+                bool is_wearing_attachment = isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item_id);
+                if (is_wearing_attachment && is_flagged_questionable)
+                {
+                    LL_DEBUGS("Avatar") << "ATT was flagged questionable but is now " 
+                                        << (is_wearing_attachment ? "attached " : "") 
+                                        <<"removing flag after "
+                                        << timer.getElapsedTimeF32() << " item "
+                                        << inv_item->getName() << " id " << item_id << LL_ENDL;
+                    mQuestionableCOFLinks.removeTime(item_id);
+                }
+            }
+        }
+
+        for(LLItemRequestTimes::iterator it = mQuestionableCOFLinks.begin();
+            it != mQuestionableCOFLinks.end(); )
+        {
+            LLItemRequestTimes::iterator curr_it = it;
+            ++it;
+            const LLUUID& item_id = curr_it->first;
+            LLViewerInventoryItem *inv_item = gInventory.getItem(item_id);
+            if (curr_it->second.getElapsedTimeF32() > MAX_BAD_COF_TIME)
+            {
+                if (LLAppearanceMgr::instance().isLinkedInCOF(item_id))
+                {
+                    LL_DEBUGS("Avatar") << "ATT Linked in COF but not attached or requested, deleting link after "
+                                        << curr_it->second.getElapsedTimeF32() << " seconds for " 
+                                        << (inv_item ? inv_item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;
+                    LLAppearanceMgr::instance().removeCOFItemLinks(item_id);
+                }
+				mQuestionableCOFLinks.erase(curr_it);
+                continue;
+            }
+        }
 }
 
 void LLAttachmentsMgr::spamStatusInfo()
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index b8d3adac0d..f9d321398f 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -109,6 +109,7 @@ private:
 	void linkRecentlyArrivedAttachments();
     void expireOldAttachmentRequests();
     void expireOldDetachRequests();
+    void checkInvalidCOFLinks();
     void spamStatusInfo();
 
     // Attachments that we are planning to rez but haven't requested from the server yet.
@@ -124,6 +125,8 @@ private:
     std::set<LLUUID> mRecentlyArrivedAttachments;
     LLTimer mCOFLinkBatchTimer;
 
+    // Attachments that are linked in the COF but may be invalid.
+	LLItemRequestTimes mQuestionableCOFLinks;
 };
 
 #endif
-- 
cgit v1.3


From 4d689fc5155458f71912ff11c869d1b2e2e3076e Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 22 Apr 2015 16:09:02 -0400
Subject: MAINT-4653 WIP, DRTVWR-397 WIP - log output to file now includes
 tags. Request max 5 attachments per idle loop to reduce sim-side failures
 seen when requesting large numbers.

---
 indra/llcommon/llerror.cpp         | 16 +++++++----
 indra/newview/llattachmentsmgr.cpp | 56 +++++++++++++++++++-------------------
 indra/newview/llattachmentsmgr.h   |  4 +--
 indra/newview/llvoavatar.cpp       |  2 +-
 4 files changed, 42 insertions(+), 36 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 22cd861c72..bf57e47756 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -119,6 +119,7 @@ namespace {
 				LL_INFOS() << "Error setting log file to " << filename << LL_ENDL;
 			}
 			mWantsTime = true;
+            mWantsTags = true;
 		}
 		
 		~RecordToFile()
@@ -558,7 +559,7 @@ namespace LLError
 		mFunctionString += std::string(mFunction) + ":";
 		for (size_t i = 0; i < mTagCount; i++)
 		{
-			mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : " ");
+			mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : ",");
 		}
 	}
 
@@ -931,14 +932,19 @@ namespace
 			}
 
 			if (show_level && r->wantsLevel())
-				{
-				message_stream << site.mLevelString << " ";
-				}
+            {
+				message_stream << site.mLevelString;
+            }
 				
 			if (show_tags && r->wantsTags())
 			{
-				message_stream << site.mTagString << " ";
+				message_stream << site.mTagString;
 			}
+			if ((show_level && r->wantsLevel())||
+                (show_tags && r->wantsTags()))
+            {
+                message_stream << " ";
+            }
 
 			if (show_function && r->wantsFunctionName())
 			{
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index bbfcb6b955..39c21a195a 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -117,7 +117,6 @@ void LLAttachmentsMgr::requestPendingAttachments()
 	if (mPendingAttachments.size())
 	{
 		requestAttachments(mPendingAttachments);
-		mPendingAttachments.clear();
 	}
 }
 
@@ -125,7 +124,7 @@ void LLAttachmentsMgr::requestPendingAttachments()
 // request at most 40 attachments and the rest will be
 // ignored. Currently the max attachments per avatar is 38, so the 40
 // limit should not be hit in practice.
-void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_requests)
+void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests)
 {
 	// Make sure we got a region before trying anything else
 	if( !gAgent.getRegion() )
@@ -133,7 +132,8 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 		return;
 	}
 
-	S32 obj_count = attachment_requests.size();
+    const S32 max_objects_per_request = 5;
+	S32 obj_count = llmin((S32)attachment_requests.size(),max_objects_per_request);
 	if (obj_count == 0)
 	{
 		return;
@@ -145,7 +145,7 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
 	if( obj_count > MAX_OBJECTS_TO_SEND )
 	{
-        LL_WARNS() << "ATT Too many attachments requested: " << attachment_requests.size()
+        LL_WARNS() << "ATT Too many attachments requested: " << obj_count
                    << " exceeds limit of " << MAX_OBJECTS_TO_SEND << LL_ENDL;
         LL_WARNS() << "ATT Excess requests will be ignored" << LL_ENDL;
 
@@ -159,12 +159,10 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 	compound_msg_id.generate();
 	LLMessageSystem* msg = gMessageSystem;
 
-	
-	S32 i = 0;
-	for (attachments_vec_t::const_iterator iter = attachment_requests.begin();
-		 iter != attachment_requests.end();
-		 ++iter)
-	{
+    // by construction, obj_count <= attachment_requests.size(), so no
+    // check against empty() is needed here.
+    for (S32 i=0; i<obj_count; i++)
+    {
 		if( 0 == (i % OBJECTS_PER_PACKET) )
 		{
 			// Start a new message chunk
@@ -178,33 +176,35 @@ void LLAttachmentsMgr::requestAttachments(const attachments_vec_t& attachment_re
 			msg->addBOOLFast(_PREHASH_FirstDetachAll, false );
 		}
 
-		const AttachmentsInfo &attachment = (*iter);
+		const AttachmentsInfo& attachment = attachment_requests.front();
 		LLViewerInventoryItem* item = gInventory.getItem(attachment.mItemID);
-		if (!item)
+		if (item)
+        {
+            LL_DEBUGS("Avatar") << "ATT requesting from attachment_requests " << item->getName()
+                                << " " << item->getLinkedUUID() << LL_ENDL;
+            S32 attachment_pt = attachment.mAttachmentPt;
+            if (attachment.mAdd) 
+                attachment_pt |= ATTACHMENT_ADD;
+            
+            msg->nextBlockFast(_PREHASH_ObjectData );
+            msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
+            msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
+            msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
+            pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
+            msg->addStringFast(_PREHASH_Name, item->getName());
+            msg->addStringFast(_PREHASH_Description, item->getDescription());
+        }
+        else
 		{
-			LL_INFOS() << "Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
-			continue;
+			LL_INFOS("Avatar") << "ATT Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
 		}
-		LL_DEBUGS("Avatar") << "ATT requesting from attachment_requests " << item->getName()
-							<< " " << item->getLinkedUUID() << LL_ENDL;
-		S32 attachment_pt = attachment.mAttachmentPt;
-		if (attachment.mAdd) 
-			attachment_pt |= ATTACHMENT_ADD;
-
-		msg->nextBlockFast(_PREHASH_ObjectData );
-		msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
-		msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
-		msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
-		pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
-		msg->addStringFast(_PREHASH_Name, item->getName());
-		msg->addStringFast(_PREHASH_Description, item->getDescription());
 
 		if( (i+1 == obj_count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
 		{
 			// End of message chunk
 			msg->sendReliable( gAgent.getRegion()->getHost() );
 		}
-		i++;
+        attachment_requests.pop_front();
 	}
 }
 
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
index f9d321398f..d56d6eb27b 100755
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -70,7 +70,7 @@ public:
 		U8 mAttachmentPt;
 		BOOL mAdd;
 	};
-	typedef std::vector<AttachmentsInfo> attachments_vec_t;
+	typedef std::deque<AttachmentsInfo> attachments_vec_t;
 
 	LLAttachmentsMgr();
 	virtual ~LLAttachmentsMgr();
@@ -79,7 +79,7 @@ public:
                               const U8 attachment_pt,
                               const BOOL add);
     void onAttachmentRequested(const LLUUID& item_id);
-	void requestAttachments(const attachments_vec_t& attachment_requests);
+	void requestAttachments(attachments_vec_t& attachment_requests);
 	static void onIdle(void *);
 
     void onAttachmentArrived(const LLUUID& inv_item_id);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ff9e021f8e..0a578fc0b3 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -732,7 +732,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	const BOOL needsSendToSim = false; // currently, this HUD effect doesn't need to pack and unpack data to do its job
 	mVoiceVisualizer = ( LLVoiceVisualizer *)LLHUDManager::getInstance()->createViewerEffect( LLHUDObject::LL_HUD_EFFECT_VOICE_VISUALIZER, needsSendToSim );
 
-	LL_DEBUGS("Avatar") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
+	LL_DEBUGS("Avatar","Message") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
 
 	mPelvisp = NULL;
 
-- 
cgit v1.3


From ff42e557848158d5a01cc260bac0bbf974650934 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 24 Apr 2015 10:06:30 -0400
Subject: DRTVWR-397 WIP - comments and logging

---
 indra/newview/llattachmentsmgr.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 39c21a195a..799a25ddc9 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -132,6 +132,9 @@ void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests
 		return;
 	}
 
+    // For unknown reasons, requesting many attachments at once causes
+    // frequent server-side failures. Here we're limiting the number
+    // of attachments requested per idle loop.
     const S32 max_objects_per_request = 5;
 	S32 obj_count = llmin((S32)attachment_requests.size(),max_objects_per_request);
 	if (obj_count == 0)
@@ -147,7 +150,6 @@ void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests
 	{
         LL_WARNS() << "ATT Too many attachments requested: " << obj_count
                    << " exceeds limit of " << MAX_OBJECTS_TO_SEND << LL_ENDL;
-        LL_WARNS() << "ATT Excess requests will be ignored" << LL_ENDL;
 
 		obj_count = MAX_OBJECTS_TO_SEND;
 	}
@@ -159,8 +161,10 @@ void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests
 	compound_msg_id.generate();
 	LLMessageSystem* msg = gMessageSystem;
 
-    // by construction, obj_count <= attachment_requests.size(), so no
-    // check against empty() is needed here.
+    // by construction above, obj_count <= attachment_requests.size(), so no
+    // check against attachment_requests.empty() is needed.
+    llassert(obj_count <= attachment_requests.size());
+
     for (S32 i=0; i<obj_count; i++)
     {
 		if( 0 == (i % OBJECTS_PER_PACKET) )
@@ -196,7 +200,7 @@ void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests
         }
         else
 		{
-			LL_INFOS("Avatar") << "ATT Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
+			LL_WARNS("Avatar") << "ATT Attempted to add non-existent item ID:" << attachment.mItemID << LL_ENDL;
 		}
 
 		if( (i+1 == obj_count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
-- 
cgit v1.3


From e2544fabe5f63201ca11102aa9b4266cb62211bd Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 18 May 2015 13:10:26 -0400
Subject: MAINT-5222 WIP - checks for app shutting down a couple of places.

---
 indra/newview/llappearancemgr.cpp  | 5 ++++-
 indra/newview/llattachmentsmgr.cpp | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llattachmentsmgr.cpp')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index dabb3df7af..c13edb9915 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -528,7 +528,10 @@ LLUpdateAppearanceAndEditWearableOnDestroy::LLUpdateAppearanceAndEditWearableOnD
 LLRequestServerAppearanceUpdateOnDestroy::~LLRequestServerAppearanceUpdateOnDestroy()
 {
 	LL_DEBUGS("Avatar") << "ATT requesting server appearance update" << LL_ENDL;
-	LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+    if (!LLApp::isExiting())
+    {
+        LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+    }
 }
 
 void edit_wearable_and_customize_avatar(LLUUID item_id)
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 799a25ddc9..2a137cc39b 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -99,6 +99,11 @@ void LLAttachmentsMgr::onIdle()
 		return;
 	}
 
+    if (LLApp::isExiting())
+    {
+        return;
+    }
+
 	requestPendingAttachments();
 
     linkRecentlyArrivedAttachments();
-- 
cgit v1.3