* refactor: remove AssetCache field hanging off Scene

* This is always available at Scene.CommsManager.AssetCache

1 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0c6ad0d..c98629b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         AssetBase asset =
                             CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
-                        AssetCache.AddAsset(asset);
+                        CommsManager.AssetCache.AddAsset(asset);
 
                         item.AssetID = asset.Metadata.FullID;
                         userInfo.UpdateItem(item);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
-            AssetCache.AddAsset(asset);
+            CommsManager.AssetCache.AddAsset(asset);
 
             if (isScriptRunning)
             {
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             AssetBase asset
-                = AssetCache.GetAsset(
+                = CommsManager.AssetCache.GetAsset(
                     item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
 
             if (asset != null)
@@ -903,7 +903,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
                     AssetBase asset = CreateAsset(name, description, assetType, data);
-                    AssetCache.AddAsset(asset);
+                    CommsManager.AssetCache.AddAsset(asset);
 
                     CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
                 }
@@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n}"));
-                AssetCache.AddAsset(asset);
+                CommsManager.AssetCache.AddAsset(asset);
 
                 TaskInventoryItem taskItem = new TaskInventoryItem();
 
@@ -1952,7 +1952,7 @@ namespace OpenSim.Region.Framework.Scenes
                 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
                 (sbyte)AssetType.Object,
                 Utils.StringToBytes(sceneObjectXml));
-            AssetCache.AddAsset(asset);
+            CommsManager.AssetCache.AddAsset(asset);
             assetID = asset.Metadata.FullID;
 
             if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
                             objectGroup.GetPartDescription(objectGroup.LocalId),
                             (sbyte)AssetType.Object,
                             Utils.StringToBytes(sceneObjectXml));
-                        AssetCache.AddAsset(asset);
+                        CommsManager.AssetCache.AddAsset(asset);
 
                         item.AssetID = asset.Metadata.FullID;
                         item.Description = asset.Metadata.Description;
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Framework.Scenes
                         grp.GetPartDescription(grp.LocalId),
                         (sbyte)AssetType.Object,
                         Utils.StringToBytes(sceneObjectXml));
-                    AssetCache.AddAsset(asset);
+                    CommsManager.AssetCache.AddAsset(asset);
 
                     InventoryItemBase item = new InventoryItemBase();
                     item.Creator = grp.RootPart.CreatorID;
@@ -2239,7 +2239,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (item != null)
                     {
-                        AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
+                        AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
 
                         if (rezAsset != null)
                         {
@@ -2407,7 +2407,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 UUID ownerID = item.OwnerID;
 
-                AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
+                AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
 
                 if (rezAsset != null)
                 {