diff options
author | John Hurliman | 2010-04-07 09:58:16 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-07 09:58:16 -0700 |
commit | 542abb9c43da40779eca2e09cec92e6fece159fd (patch) | |
tree | 091024aaa46ee5e9ccda2443ff99670b0767491c | |
parent | Added NullInventoryData for unit tests and quick try-outs of the services in ... (diff) | |
download | opensim-SC-542abb9c43da40779eca2e09cec92e6fece159fd.zip opensim-SC-542abb9c43da40779eca2e09cec92e6fece159fd.tar.gz opensim-SC-542abb9c43da40779eca2e09cec92e6fece159fd.tar.bz2 opensim-SC-542abb9c43da40779eca2e09cec92e6fece159fd.tar.xz |
* Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
* Changing the SimianGrid asset service connector to match the corrected documentation
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 | ||||
-rw-r--r-- | 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 4a7522f..36c51c3 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
207 | AssetBase asset = m_cache.Get(id); | 207 | AssetBase asset = m_cache.Get(id); |
208 | if (asset != null) | 208 | if (asset != null) |
209 | { | 209 | { |
210 | Util.FireAndForget(delegate(object o) { handler(id, sender, asset); }); | 210 | handler(id, sender, asset); |
211 | return true; | 211 | return true; |
212 | } | 212 | } |
213 | } | 213 | } |
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 6dfe78d..f8bedfe 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs | |||
@@ -51,7 +51,8 @@ namespace OpenSim.Services.Interfaces | |||
51 | byte[] GetData(string id); | 51 | byte[] GetData(string id); |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Get an asset asynchronously | 54 | /// Get an asset synchronously or asynchronously (depending on whether |
55 | /// it is locally cached) and fire a callback with the fetched asset | ||
55 | /// </summary> | 56 | /// </summary> |
56 | /// <param name="id">The asset id</param> | 57 | /// <param name="id">The asset id</param> |
57 | /// <param name="sender">Represents the requester. Passed back via the handler</param> | 58 | /// <param name="sender">Represents the requester. Passed back via the handler</param> |