aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs2
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs3
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs5
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
23 files changed, 44 insertions, 50 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 8778acd..cf0f917 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -130,7 +130,7 @@ namespace OpenSim
130 130
131 return 131 return
132 new HGScene( 132 new HGScene(
133 regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, 133 regionInfo, circuitManager, m_commsManager, sceneGridService, storageManager,
134 m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 134 m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim,
135 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 135 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
136 } 136 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8198138..add7cb9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -663,7 +663,7 @@ namespace OpenSim
663 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 663 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
664 664
665 return new Scene( 665 return new Scene(
666 regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, 666 regionInfo, circuitManager, m_commsManager, sceneGridService,
667 storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 667 storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim,
668 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 668 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
669 } 669 }
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 6327466..2c6b51d 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
86 86
87 Caps caps 87 Caps caps
88 = new Caps( 88 = new Caps(
89 m_scene.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, 89 m_scene.CommsManager.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName,
90 m_scene.CommsManager.HttpServer.Port, 90 m_scene.CommsManager.HttpServer.Port,
91 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); 91 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName);
92 92
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 2f98bab..ae71fda 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
152 TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); 152 TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
153 m_textureSenders.Add(e.RequestedAssetID, requestHandler); 153 m_textureSenders.Add(e.RequestedAssetID, requestHandler);
154 154
155 m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); 155 m_scene.CommsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
156 } 156 }
157 } 157 }
158 } 158 }
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index c70f65c..7caa786 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -114,7 +114,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
114 114
115 protected void AddHttpHandlers(Scene m_scene) 115 protected void AddHttpHandlers(Scene m_scene)
116 { 116 {
117 IAssetDataPlugin m_assetProvider = ((AssetServerBase)m_scene.AssetCache.AssetServer).AssetProviderPlugin; 117 IAssetDataPlugin m_assetProvider
118 = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
118 119
119 BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; 120 BaseHttpServer httpServer = m_scene.CommsManager.HttpServer;
120 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); 121 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 121dc3c..d6f0713 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
212 if (BlendWithOldTexture) 212 if (BlendWithOldTexture)
213 { 213 {
214 UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; 214 UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID;
215 oldAsset = scene.AssetCache.GetAsset(lastTextureID, true); 215 oldAsset = scene.CommsManager.AssetCache.GetAsset(lastTextureID, true);
216 if (oldAsset != null) 216 if (oldAsset != null)
217 { 217 {
218 assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha); 218 assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
238 asset.Metadata.Description = "dynamic image"; 238 asset.Metadata.Description = "dynamic image";
239 asset.Metadata.Local = false; 239 asset.Metadata.Local = false;
240 asset.Metadata.Temporary = true; 240 asset.Metadata.Temporary = true;
241 scene.AssetCache.AddAsset(asset); 241 scene.CommsManager.AssetCache.AddAsset(asset);
242 242
243 LastAssetID = asset.Metadata.FullID; 243 LastAssetID = asset.Metadata.FullID;
244 244
@@ -254,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
254 254
255 // remove the old asset from the cache 255 // remove the old asset from the cache
256 UUID oldID = tmptex.DefaultTexture.TextureID; 256 UUID oldID = tmptex.DefaultTexture.TextureID;
257 scene.AssetCache.ExpireAsset(oldID); 257 scene.CommsManager.AssetCache.ExpireAsset(oldID);
258 258
259 tmptex.DefaultTexture.TextureID = asset.Metadata.FullID; 259 tmptex.DefaultTexture.TextureID = asset.Metadata.FullID;
260 // I'm pretty sure we always want to force this to true 260 // I'm pretty sure we always want to force this to true
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 9497869..66fc43b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
297 asset.Metadata.Type = assetType; 297 asset.Metadata.Type = assetType;
298 asset.Data = data; 298 asset.Data = data;
299 299
300 m_scene.AssetCache.AddAsset(asset); 300 m_scene.CommsManager.AssetCache.AddAsset(asset);
301 301
302 /** 302 /**
303 * Create layers on decode for image assets. This is likely to significantly increase the time to load archives so 303 * Create layers on decode for image assets. This is likely to significantly increase the time to load archives so
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index bd36779..139dff0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
104 protected AssetBase GetAsset(UUID uuid) 104 protected AssetBase GetAsset(UUID uuid)
105 { 105 {
106 m_waitingForObjectAsset = true; 106 m_waitingForObjectAsset = true;
107 m_scene.AssetCache.GetAsset(uuid, AssetRequestCallback, true); 107 m_scene.CommsManager.AssetCache.GetAsset(uuid, AssetRequestCallback, true);
108 108
109 // The asset cache callback can either 109 // The asset cache callback can either
110 // 110 //
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
324 m_scene, 324 m_scene,
325 m_saveStream); 325 m_saveStream);
326 326
327 new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); 327 new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute();
328 } 328 }
329 } 329 }
330} 330}
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 2e018d3..69d3dac 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
159 // will wait anyway) 159 // will wait anyway)
160 private Bitmap fetchTexture(UUID id) 160 private Bitmap fetchTexture(UUID id)
161 { 161 {
162 AssetBase asset = m_scene.AssetCache.GetAsset(id, true); 162 AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(id, true);
163 m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null); 163 m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null);
164 if (asset == null) return null; 164 if (asset == null) return null;
165 165
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 9355374..e1c3d85 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -738,7 +738,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
738 imgstream = new MemoryStream(); 738 imgstream = new MemoryStream();
739 739
740 // non-async because we know we have the asset immediately. 740 // non-async because we know we have the asset immediately.
741 AssetBase mapasset = m_scene.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true); 741 AssetBase mapasset = m_scene.CommsManager.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true);
742 742
743 // Decode image to System.Drawing.Image 743 // Decode image to System.Drawing.Image
744 if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image)) 744 if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 4039288..1f01fa2 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
129 { 129 {
130 AssetBase asset1 = new AssetBase(); 130 AssetBase asset1 = new AssetBase();
131 Copy(asset, asset1); 131 Copy(asset, asset1);
132 m_scene.AssetCache.AssetServer.StoreAsset(asset1); 132 m_scene.CommsManager.AssetCache.AssetServer.StoreAsset(asset1);
133 } 133 }
134 return true; 134 return true;
135 } 135 }
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index ea03cf9..423acc1 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -49,10 +49,10 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
49 49
50 public HGScene(RegionInfo regInfo, AgentCircuitManager authen, 50 public HGScene(RegionInfo regInfo, AgentCircuitManager authen,
51 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 51 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
52 IAssetCache assetCach, StorageManager storeManager, 52 StorageManager storeManager,
53 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 53 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
54 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 54 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
55 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, 55 : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader,
56 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 56 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
57 { 57 {
58 m_log.Info("[HGScene]: Starting HGScene."); 58 m_log.Info("[HGScene]: Starting HGScene.");
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
191 191
192 AssetBase asset = 192 AssetBase asset =
193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); 193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
194 AssetCache.AddAsset(asset); 194 CommsManager.AssetCache.AddAsset(asset);
195 195
196 item.AssetID = asset.Metadata.FullID; 196 item.AssetID = asset.Metadata.FullID;
197 userInfo.UpdateItem(item); 197 userInfo.UpdateItem(item);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Framework.Scenes
277 } 277 }
278 278
279 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data); 279 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
280 AssetCache.AddAsset(asset); 280 CommsManager.AssetCache.AddAsset(asset);
281 281
282 if (isScriptRunning) 282 if (isScriptRunning)
283 { 283 {
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Framework.Scenes
681 } 681 }
682 682
683 AssetBase asset 683 AssetBase asset
684 = AssetCache.GetAsset( 684 = CommsManager.AssetCache.GetAsset(
685 item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false)); 685 item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
686 686
687 if (asset != null) 687 if (asset != null)
@@ -903,7 +903,7 @@ namespace OpenSim.Region.Framework.Scenes
903 } 903 }
904 904
905 AssetBase asset = CreateAsset(name, description, assetType, data); 905 AssetBase asset = CreateAsset(name, description, assetType, data);
906 AssetCache.AddAsset(asset); 906 CommsManager.AssetCache.AddAsset(asset);
907 907
908 CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); 908 CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
909 } 909 }
@@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Framework.Scenes
1530 return; 1530 return;
1531 1531
1532 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}")); 1532 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}"));
1533 AssetCache.AddAsset(asset); 1533 CommsManager.AssetCache.AddAsset(asset);
1534 1534
1535 TaskInventoryItem taskItem = new TaskInventoryItem(); 1535 TaskInventoryItem taskItem = new TaskInventoryItem();
1536 1536
@@ -1952,7 +1952,7 @@ namespace OpenSim.Region.Framework.Scenes
1952 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId), 1952 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
1953 (sbyte)AssetType.Object, 1953 (sbyte)AssetType.Object,
1954 Utils.StringToBytes(sceneObjectXml)); 1954 Utils.StringToBytes(sceneObjectXml));
1955 AssetCache.AddAsset(asset); 1955 CommsManager.AssetCache.AddAsset(asset);
1956 assetID = asset.Metadata.FullID; 1956 assetID = asset.Metadata.FullID;
1957 1957
1958 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1958 if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
2078 objectGroup.GetPartDescription(objectGroup.LocalId), 2078 objectGroup.GetPartDescription(objectGroup.LocalId),
2079 (sbyte)AssetType.Object, 2079 (sbyte)AssetType.Object,
2080 Utils.StringToBytes(sceneObjectXml)); 2080 Utils.StringToBytes(sceneObjectXml));
2081 AssetCache.AddAsset(asset); 2081 CommsManager.AssetCache.AddAsset(asset);
2082 2082
2083 item.AssetID = asset.Metadata.FullID; 2083 item.AssetID = asset.Metadata.FullID;
2084 item.Description = asset.Metadata.Description; 2084 item.Description = asset.Metadata.Description;
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Framework.Scenes
2115 grp.GetPartDescription(grp.LocalId), 2115 grp.GetPartDescription(grp.LocalId),
2116 (sbyte)AssetType.Object, 2116 (sbyte)AssetType.Object,
2117 Utils.StringToBytes(sceneObjectXml)); 2117 Utils.StringToBytes(sceneObjectXml));
2118 AssetCache.AddAsset(asset); 2118 CommsManager.AssetCache.AddAsset(asset);
2119 2119
2120 InventoryItemBase item = new InventoryItemBase(); 2120 InventoryItemBase item = new InventoryItemBase();
2121 item.Creator = grp.RootPart.CreatorID; 2121 item.Creator = grp.RootPart.CreatorID;
@@ -2239,7 +2239,7 @@ namespace OpenSim.Region.Framework.Scenes
2239 2239
2240 if (item != null) 2240 if (item != null)
2241 { 2241 {
2242 AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); 2242 AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
2243 2243
2244 if (rezAsset != null) 2244 if (rezAsset != null)
2245 { 2245 {
@@ -2407,7 +2407,7 @@ namespace OpenSim.Region.Framework.Scenes
2407 { 2407 {
2408 UUID ownerID = item.OwnerID; 2408 UUID ownerID = item.OwnerID;
2409 2409
2410 AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); 2410 AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
2411 2411
2412 if (rezAsset != null) 2412 if (rezAsset != null)
2413 { 2413 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0f57b7c..c3ab5e9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Framework.Scenes
268 268
269 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 269 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
270 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 270 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
271 IAssetCache assetCach, StorageManager storeManager, 271 StorageManager storeManager,
272 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 272 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
273 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 273 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
274 { 274 {
@@ -281,7 +281,6 @@ namespace OpenSim.Region.Framework.Scenes
281 CommsManager = commsMan; 281 CommsManager = commsMan;
282 m_sceneGridService = sceneGridService; 282 m_sceneGridService = sceneGridService;
283 m_storageManager = storeManager; 283 m_storageManager = storeManager;
284 AssetCache = assetCach;
285 m_regInfo = regInfo; 284 m_regInfo = regInfo;
286 m_regionHandle = m_regInfo.RegionHandle; 285 m_regionHandle = m_regInfo.RegionHandle;
287 m_regionName = m_regInfo.RegionName; 286 m_regionName = m_regInfo.RegionName;
@@ -3543,7 +3542,7 @@ namespace OpenSim.Region.Framework.Scenes
3543 group.GetPartDescription(localID), 3542 group.GetPartDescription(localID),
3544 (sbyte)AssetType.Object, 3543 (sbyte)AssetType.Object,
3545 Utils.StringToBytes(sceneObjectXml)); 3544 Utils.StringToBytes(sceneObjectXml));
3546 AssetCache.AddAsset(asset); 3545 CommsManager.AssetCache.AddAsset(asset);
3547 3546
3548 InventoryItemBase item = new InventoryItemBase(); 3547 InventoryItemBase item = new InventoryItemBase();
3549 item.Creator = part.CreatorID; 3548 item.Creator = part.CreatorID;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 3f5c781..3695b21 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -126,14 +126,6 @@ namespace OpenSim.Region.Framework.Scenes
126 126
127 protected string m_datastore; 127 protected string m_datastore;
128 128
129 private IAssetCache m_assetCache;
130
131 public IAssetCache AssetCache
132 {
133 get { return m_assetCache; }
134 set { m_assetCache = value; }
135 }
136
137 protected RegionStatus m_regStatus; 129 protected RegionStatus m_regStatus;
138 130
139 public RegionStatus Region_Status 131 public RegionStatus Region_Status
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index fe37dae..00b49a1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -642,7 +642,7 @@ namespace OpenSim.Region.Framework.Scenes
642 { 642 {
643 for (int i=0;i<arrassets.Length;i++) 643 for (int i=0;i<arrassets.Length;i++)
644 { 644 {
645 AssetBase ab = sn.AssetCache.GetAsset(arrassets[i], true); 645 AssetBase ab = sn.CommsManager.AssetCache.GetAsset(arrassets[i], true);
646 if (ab != null && ab.Data != null) 646 if (ab != null && ab.Data != null)
647 { 647 {
648 j2kdecode.syncdecode(arrassets[i], ab.Data); 648 j2kdecode.syncdecode(arrassets[i], ab.Data);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4b165ce..1b7ae16 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2983,7 +2983,8 @@ namespace OpenSim.Region.Framework.Scenes
2983 { 2983 {
2984 if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero) 2984 if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero)
2985 { 2985 {
2986 m_scene.AssetCache.GetAsset(part.Shape.SculptTexture, part.SculptTextureCallback, true); 2986 m_scene.CommsManager.AssetCache.GetAsset(
2987 part.Shape.SculptTexture, part.SculptTextureCallback, true);
2987 } 2988 }
2988 } 2989 }
2989 } 2990 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dfa9318..ec3fdf1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1422,8 +1422,10 @@ if (m_shape != null) {
1422 { 1422 {
1423 if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero) 1423 if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero)
1424 { 1424 {
1425 m_parentGroup.Scene.AssetCache.GetAsset(dupe.m_shape.SculptTexture, dupe.SculptTextureCallback, true); 1425 m_parentGroup.Scene.CommsManager.AssetCache.GetAsset(
1426 dupe.m_shape.SculptTexture, dupe.SculptTextureCallback, true);
1426 } 1427 }
1428
1427 bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0); 1429 bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0);
1428 dupe.DoPhysicsPropertyUpdate(UsePhysics, true); 1430 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
1429 } 1431 }
@@ -3232,8 +3234,8 @@ if (m_shape != null) {
3232 { 3234 {
3233 if (m_shape.SculptEntry && m_shape.SculptTexture != UUID.Zero) 3235 if (m_shape.SculptEntry && m_shape.SculptTexture != UUID.Zero)
3234 { 3236 {
3235 //AssetBase tx = m_parentGroup.Scene.getase 3237 m_parentGroup.Scene.CommsManager.AssetCache.GetAsset(
3236 m_parentGroup.Scene.AssetCache.GetAsset(m_shape.SculptTexture, SculptTextureCallback, true); 3238 m_shape.SculptTexture, SculptTextureCallback, true);
3237 } 3239 }
3238 } 3240 }
3239 3241
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c15ac47..c625a72 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Framework.Scenes
251 m_part.ScheduleFullUpdate(); 251 m_part.ScheduleFullUpdate();
252 return; 252 return;
253 } 253 }
254 IAssetCache cache = m_part.ParentGroup.Scene.AssetCache; 254 IAssetCache cache = m_part.ParentGroup.Scene.CommsManager.AssetCache;
255 255
256 cache.GetAsset(item.AssetID, delegate(UUID assetID, AssetBase asset) 256 cache.GetAsset(item.AssetID, delegate(UUID assetID, AssetBase asset)
257 { 257 {
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
3549 World.RegionInfo.RegionLocY * Constants.RegionSize, 3549 World.RegionInfo.RegionLocY * Constants.RegionSize,
3550 0); 3550 0);
3551 3551
3552 World.AssetCache.GetAsset(item.AssetID, 3552 World.CommsManager.AssetCache.GetAsset(item.AssetID,
3553 delegate(UUID i, AssetBase a) 3553 delegate(UUID i, AssetBase a)
3554 { 3554 {
3555 AssetLandmark lm = new AssetLandmark(a); 3555 AssetLandmark lm = new AssetLandmark(a);
@@ -8851,7 +8851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8851 public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); 8851 public delegate void AssetRequestCallback(UUID assetID, AssetBase asset);
8852 private void WithNotecard(UUID assetID, AssetRequestCallback cb) 8852 private void WithNotecard(UUID assetID, AssetRequestCallback cb)
8853 { 8853 {
8854 World.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false); 8854 World.CommsManager.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false);
8855 } 8855 }
8856 8856
8857 public LSL_String llGetNumberOfNotecardLines(string name) 8857 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
1040 + textLength.ToString() + "\n" + notecardData + "}\n"; 1040 + textLength.ToString() + "\n" + notecardData + "}\n";
1041 1041
1042 asset.Data = Encoding.ASCII.GetBytes(notecardData); 1042 asset.Data = Encoding.ASCII.GetBytes(notecardData);
1043 World.AssetCache.AddAsset(asset); 1043 World.CommsManager.AssetCache.AddAsset(asset);
1044 1044
1045 // Create Task Entry 1045 // Create Task Entry
1046 TaskInventoryItem taskItem=new TaskInventoryItem(); 1046 TaskInventoryItem taskItem=new TaskInventoryItem();
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 122e51c..12cce9d 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -39,11 +39,10 @@ namespace OpenSim.Tests.Common.Mock
39 { 39 {
40 public TestScene( 40 public TestScene(
41 RegionInfo regInfo, AgentCircuitManager authen, 41 RegionInfo regInfo, AgentCircuitManager authen,
42 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 42 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
43 IAssetCache assetCach, StorageManager storeManager,
44 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 43 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
45 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 44 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
46 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, 45 : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader,
47 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 46 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
48 { 47 {
49 } 48 }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 813c8b2..b52c081 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Tests.Common.Setup
77 IConfigSource configSource = new IniConfigSource(); 77 IConfigSource configSource = new IniConfigSource();
78 78
79 TestScene testScene = new TestScene( 79 TestScene testScene = new TestScene(
80 regInfo, acm, cm, scs, cm.AssetCache, sm, null, false, false, false, configSource, null); 80 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
81 81
82 IRegionModule capsModule = new CapabilitiesModule(); 82 IRegionModule capsModule = new CapabilitiesModule();
83 capsModule.Initialise(testScene, new IniConfigSource()); 83 capsModule.Initialise(testScene, new IniConfigSource());