From 93837807ffb24e5811368063b9231a9d8b018d9d Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 16 Feb 2009 19:15:16 +0000
Subject: * refactor: remove AssetCache field hanging off Scene * This is
 always available at Scene.CommsManager.AssetCache

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs  | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9f5d143..e5f097f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3549,7 +3549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         World.RegionInfo.RegionLocY * Constants.RegionSize,
                         0);
 
-                    World.AssetCache.GetAsset(item.AssetID,
+                    World.CommsManager.AssetCache.GetAsset(item.AssetID,
                         delegate(UUID i, AssetBase a)
                         {
                             AssetLandmark lm = new AssetLandmark(a);
@@ -8851,7 +8851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public delegate void AssetRequestCallback(UUID assetID, AssetBase asset);
         private void WithNotecard(UUID assetID, AssetRequestCallback cb)
         {
-            World.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false);
+            World.CommsManager.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false);
         }
 
         public LSL_String llGetNumberOfNotecardLines(string name)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9658376..e4ef236 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             + textLength.ToString() + "\n" + notecardData + "}\n";
 
             asset.Data = Encoding.ASCII.GetBytes(notecardData);
-            World.AssetCache.AddAsset(asset);
+            World.CommsManager.AssetCache.AddAsset(asset);
 
             // Create Task Entry
             TaskInventoryItem taskItem=new TaskInventoryItem();
-- 
cgit v1.1