Merge branch 'careminster' into careminster-presence-refactor

2026-08-12 20:55:43 +08:00 · 2010-04-13 04:36:08 +01:00
parent ba31b31ed0 a1c4585a39
commit 9920e219dd
25 changed files with 694 additions and 203 deletions
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -406,6 +406,11 @@ namespace Flotsam.RegionModules.AssetCache
            return asset;
        }

+        public AssetBase GetCached(string id)
+        {
+            return Get(id);
+        }
+
        public void Expire(string id)
        {
            if (m_LogLevel >= 2)