Merge branch '0.6.9-post-fixes' into careminster

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 6dfe78d..3be6815 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -51,7 +51,15 @@ namespace OpenSim.Services.Interfaces
         byte[] GetData(string id);
 
         /// <summary>
-        /// Get an asset asynchronously
+        /// Synchronously fetches an asset from the local cache only
+        /// </summary>
+        /// <param name="id">Asset ID</param>
+        /// <returns>The fetched asset, or null if it did not exist in the local cache</returns>
+        AssetBase GetCached(string id);
+
+        /// <summary>
+        /// 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>