From 022526661be294e74714fcc7afdff5eaee7dc8b8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 4 Oct 2009 13:38:12 -0700
Subject: Just trying a few things. This one will reduce the number of async
 calls.

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d16112d..b1d41da 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -183,7 +183,8 @@ namespace OpenSim.Services.Connectors
             }
             else
             {
-                Util.FireAndForget(delegate { handler(id, sender, asset); });
+                //Util.FireAndForget(delegate { handler(id, sender, asset); });
+                handler(id, sender, asset);
             }
 
             return true;
-- 
cgit v1.1


From a208f33c5dc4784f97dc3cd46cb56e79cc457f82 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 5 Oct 2009 00:23:47 +0100
Subject: Make the asset connector async Get overload return false if the asset
 retrieval was not synchronous.

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index b1d41da..6f7c90f 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -171,6 +171,8 @@ namespace OpenSim.Services.Connectors
 
             if (asset == null)
             {
+                bool result = false;
+
                 AsynchronousRestObjectRequester.
                         MakeRequest<int, AssetBase>("GET", uri, 0,
                         delegate(AssetBase a)
@@ -178,8 +180,10 @@ namespace OpenSim.Services.Connectors
                             if (m_Cache != null)
                                 m_Cache.Cache(a);
                             handler(id, sender, a);
+                            result = true;
                         });
 
+                return result;
             }
             else
             {
-- 
cgit v1.1