Merge branch 'careminster' into careminster-presence-refactor

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Tests/Common/Mock/MockAssetService.cs b/OpenSim/Tests/Common/Mock/MockAssetService.cs
index cb38043..4118308 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetService.cs
@@ -65,6 +65,11 @@ namespace OpenSim.Tests.Common.Mock
             return asset;
         }
 
+        public AssetBase GetCached(string id)
+        {
+            return Get(id);
+        }
+
         public AssetMetadata GetMetadata(string id)
         {
             throw new System.NotImplementedException();