diff options
| author | Oren Hurvitz | 2014-01-29 16:14:27 +0200 |
|---|---|---|
| committer | Oren Hurvitz | 2014-03-25 08:01:55 +0100 |
| commit | e131e73652cf6ed2407e41c7d83dc67f49ca23ee (patch) | |
| tree | e0d8573e47c8edd7f2effca8d4177bc57bd10a26 /OpenSim/Region/CoreModules/Avatar/Inventory | |
| parent | Changed LogThreadPool to have 4 logging levels. Added console command "debug ... (diff) | |
| download | opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.zip opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.gz opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.bz2 opensim-SC_OLD-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.xz | |
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
Resolves http://opensimulator.org/mantis/view.php?id=6945
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 4292719..d15703e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
| @@ -356,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 356 | m_scene.UserAccountService, m_scene.RegionInfo.ScopeID, | 356 | m_scene.UserAccountService, m_scene.RegionInfo.ScopeID, |
| 357 | options, ReceivedAllAssets); | 357 | options, ReceivedAllAssets); |
| 358 | 358 | ||
| 359 | Util.FireAndForget(o => ar.Execute()); | 359 | Util.RunThreadNoTimeout(o => ar.Execute(), "AssetsRequest", null); |
| 360 | } | 360 | } |
| 361 | else | 361 | else |
| 362 | { | 362 | { |