Add some asset cache plumbing. Change the generic cache from UUID to string

keys to allow caching the new crop of URI identified objects.

2 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IAssetCache.cs b/OpenSim/Region/Framework/Interfaces/IImprovedAssetCache.cs
index bd43ce5..b213284 100644
--- a/OpenSim/Region/Framework/Interfaces/IAssetCache.cs
+++ b/OpenSim/Region/Framework/Interfaces/IImprovedAssetCache.cs
@@ -25,9 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenSim.Framework;
+
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IImprovedAssetCache
     {
+        void Cache(AssetBase asset);
+        AssetBase Get(string id);
+        void Expire(string id);
+        void Clear();
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d1260d4..7cb66a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2825,8 +2825,12 @@ namespace OpenSim.Region.Framework.Scenes
             objectCapacity = objects;
         }
         
-        public List<FriendListItem> GetFriendList(UUID avatarID)
+        public List<FriendListItem> GetFriendList(string id)
         {
+            UUID avatarID;
+            if (!UUID.TryParse(id, out avatarID))
+                return new List<FriendListItem>();
+
             return CommsManager.GetUserFriendList(avatarID);
         }