From 74198479a553c8ba32afda10f27a620ce8563639 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Fri, 26 Aug 2016 22:32:31 +0200
Subject: [PATCH] [FIXED] Previous merge with default tip introduced a code
 artifact

--HG--
branch : Viewer-Build
---
 .hgtags                               |  1 +
 indra/newview/llinventoryobserver.cpp | 31 +++++----------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/.hgtags b/.hgtags
index 3920b23809..0d5a40a6ef 100755
--- a/.hgtags
+++ b/.hgtags
@@ -1037,6 +1037,7 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
 0000000000000000000000000000000000000000 4.0.4-release
 0000000000000000000000000000000000000000 4.0.5-release
 0000000000000000000000000000000000000000 4.0.6-release
+0000000000000000000000000000000000000000 4.0.7-release
 4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
 668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1
 b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 612d4903e9..ce8705b7ac 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -241,32 +241,11 @@ void fetch_items_from_llsd(const LLSD& items_llsd)
 			gInventory.requestPost(true, url, body[i], handler, (i ? "Library Item" : "Inventory Item"));
 			continue;
 		}
-		LLMessageSystem* msg = gMessageSystem;
-		BOOL start_new_message = TRUE;
-		for (S32 j=0; j<body[i]["items"].size(); j++)
-		{
-			LLSD item_entry = body[i]["items"][j];
-			if (start_new_message)
-			{
-				start_new_message = FALSE;
-				msg->newMessageFast(_PREHASH_FetchInventory);
-				msg->nextBlockFast(_PREHASH_AgentData);
-				msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-				msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-			}
-			msg->nextBlockFast(_PREHASH_InventoryData);
-			msg->addUUIDFast(_PREHASH_OwnerID, item_entry["owner_id"].asUUID());
-			msg->addUUIDFast(_PREHASH_ItemID, item_entry["item_id"].asUUID());
-			if (msg->isSendFull(NULL))
-			{
-				start_new_message = TRUE;
-				gAgent.sendReliableMessage();
-			}
-		}
-		if (!start_new_message)
-		{
-			gAgent.sendReliableMessage();
-		}
+        else
+        {
+            LL_WARNS("INVENTORY") << "Failed to get capability." << LL_ENDL;
+        }
+
 	}
 }