Merged in oz_linden/maint-5974

1 files changed, 4 insertions, 7 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 40edb13a80..4a77edc565 100755
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -513,7 +513,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 
 				if (! url.empty())
 				{
-					BGFolderHttpHandler * handler(new BGFolderHttpHandler(folder_request_body, recursive_cats));
+                    LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(folder_request_body, recursive_cats));
 					gInventory.requestPost(false, url, folder_request_body, handler, "Inventory Folder");
 				}
 			}
@@ -524,7 +524,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 
 				if (! url.empty())
 				{
-					BGFolderHttpHandler * handler(new BGFolderHttpHandler(folder_request_body_lib, recursive_cats));
+                    LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(folder_request_body_lib, recursive_cats));
 					gInventory.requestPost(false, url, folder_request_body_lib, handler, "Library Folder");
 				}
 			}
@@ -540,7 +540,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 				{
 					LLSD body;
 					body["items"] = item_request_body;
-					BGItemHttpHandler * handler(new BGItemHttpHandler(body));
+                    LLCore::HttpHandler::ptr_t  handler(new BGItemHttpHandler(body));
 					gInventory.requestPost(false, url, body, handler, "Inventory Item");
 				}
 			}
@@ -553,7 +553,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 				{
 					LLSD body;
 					body["items"] = item_request_body_lib;
-					BGItemHttpHandler * handler(new BGItemHttpHandler(body));
+                    LLCore::HttpHandler::ptr_t handler(new BGItemHttpHandler(body));
 					gInventory.requestPost(false, url, body, handler, "Library Item");
 				}
 			}
@@ -647,9 +647,6 @@ void BGFolderHttpHandler::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRes
 		processData(body_llsd, response);
 	}
 	while (false);
-
-	// Must delete on completion.
-	delete this;
 }