From 542abb9c43da40779eca2e09cec92e6fece159fd Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Wed, 7 Apr 2010 09:58:16 -0700
Subject: [PATCH] * Fixing incorrect documentation for the continuation passing
 style IAssetService.Get() method * Changing the SimianGrid asset service
 connector to match the corrected documentation

---
 .../Connectors/SimianGrid/SimianAssetServiceConnector.cs       | 2 +-
 OpenSim/Services/Interfaces/IAssetService.cs                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 4a7522fcfb..36c51c3075 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 AssetBase asset = m_cache.Get(id);
                 if (asset != null)
                 {
-                    Util.FireAndForget(delegate(object o) { handler(id, sender, asset); });
+                    handler(id, sender, asset);
                     return true;
                 }
             }
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 6dfe78d724..f8bedfe1a3 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Services.Interfaces
         byte[] GetData(string id);
 
         /// <summary>
-        /// Get an asset asynchronously
+        /// Get an asset synchronously or asynchronously (depending on whether 
+        /// it is locally cached) and fire a callback with the fetched asset
         /// </summary>
         /// <param name="id">The asset id</param>
         /// <param name="sender">Represents the requester.  Passed back via the handler</param>