aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-09-18 19:40:59 +0100
committerUbitUmarov2014-09-18 19:40:59 +0100
commitf35f90bd7289598d6209d6b1de6222aff600dff5 (patch)
treea943c71afdfabc0d5aec39d3613bd43e9995c060 /OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
parentMerge branch 'master' into ubitworkmaster (diff)
downloadopensim-SC-f35f90bd7289598d6209d6b1de6222aff600dff5.zip
opensim-SC-f35f90bd7289598d6209d6b1de6222aff600dff5.tar.gz
opensim-SC-f35f90bd7289598d6209d6b1de6222aff600dff5.tar.bz2
opensim-SC-f35f90bd7289598d6209d6b1de6222aff600dff5.tar.xz
dont give a ring to each asset request, just one to rule them all, i mean
thread not ring
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs23
1 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 9b0ebcf..2c1d946 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -328,17 +328,24 @@ namespace OpenSim.Services.Connectors
328 m_AssetHandlers.Remove(id); 328 m_AssetHandlers.Remove(id);
329 } 329 }
330 330
331 foreach (AssetRetrievedEx h in handlers) 331 Util.FireAndForget(x =>
332 {
333 Util.FireAndForget(x =>
334 { 332 {
335 try { h.Invoke(a); } 333 foreach (AssetRetrievedEx h in handlers)
336 catch { } 334 {
335 // Util.FireAndForget(x =>
336 // {
337 try { h.Invoke(a); }
338 catch { }
339 // });
340 }
341
342 if (handlers != null)
343 handlers.Clear();
344
337 }); 345 });
338 }
339 346
340 if (handlers != null) 347// if (handlers != null)
341 handlers.Clear(); 348// handlers.Clear();
342 349
343 success = true; 350 success = true;
344 } 351 }