diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index 67cb20805a..48f0c7d061 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -79,11 +79,6 @@ private:
 	std::string sName;
 };
 
-void uploadDone(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response)
-{
-	FSLSLBridge::getInstance()->setTimerResult(FSLSLBridge::SCRIPT_UPLOAD_FINISHED);
-}
-
 //
 //
 // Bridge functionality
@@ -1259,7 +1254,10 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
 		const std::string fName = prepUploadFile(buffer);
 		if (!fName.empty())
 		{
-			LLResourceUploadInfo::ptr_t uploadInfo(new FSMonoScriptAssetUpload(	inv_item,  buffer, uploadDone ));
+			LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<FSMonoScriptAssetUpload>(inv_item, buffer, 
+				[](LLUUID itemId, LLUUID, LLUUID, LLSD response) {
+					FSLSLBridge::getInstance()->setTimerResult(FSLSLBridge::SCRIPT_UPLOAD_FINISHED);
+				}));
 			LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
 
 			LL_INFOS("FSLSLBridge") << "updating script ID for bridge" << LL_ENDL;
diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp
index 76fcc8f012..7decc63ab8 100644
--- a/indra/newview/particleeditor.cpp
+++ b/indra/newview/particleeditor.cpp
@@ -577,11 +577,6 @@ void ParticleEditor::onInjectButtonClicked()
 	setCanClose(FALSE);
 }
 
-void scriptUploadDone( LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, ParticleEditor *aEditor )
-{
-	aEditor->scriptInjectReturned();
-}
-
 void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
 {
 	setCanClose(TRUE);
@@ -608,8 +603,10 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
 	{
 		std::string script = createScript();
 
-		LLBufferedAssetUploadInfo::taskUploadFinish_f proc = boost::bind(scriptUploadDone, _1, _2, _3, _4, this );
-		LLResourceUploadInfo::ptr_t uploadInfo(new LLScriptAssetUpload(mObject->getID(), inventoryItemID, LLScriptAssetUpload::MONO, true, LLUUID::null, script, proc));
+		LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<LLScriptAssetUpload>(mObject->getID(), inventoryItemID, LLScriptAssetUpload::MONO, true, LLUUID::null, script,
+			[this](LLUUID itemId, LLUUID, LLUUID, LLSD response) {
+				this->scriptInjectReturned();
+			}));
 		LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
 
 		mMainPanel->setEnabled(FALSE);