From 637d35631cd88258d5f3da44c2959985a047ae2d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 21 Jun 2017 18:39:58 +0100
Subject: make oar/iar assets writer be done by caller thread like the rest of
 the oar/iar save. This may look more painfull but should reduce errors and
 threads fights. Fill lucky i just don't stop the entire simulation during
 this

---
 .../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index f002ad7..dde93db 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -423,14 +423,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     m_log.DebugFormat(
                         "[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetGatherer.GatheredUuids.Count);
 
-                    AssetsRequest ar
-                        = new AssetsRequest(
+                    AssetsRequest ar = new AssetsRequest(
                             new AssetsArchiver(m_archiveWriter),
                             m_assetGatherer.GatheredUuids, m_scene.AssetService,
                             m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
                             options, ReceivedAllAssets);
-
-                    WorkManager.RunInThread(o => ar.Execute(), null, string.Format("AssetsRequest ({0})", m_scene.Name));
+                   ar.Execute();
                 }
                 else
                 {
-- 
cgit v1.1