diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
4 files changed, 5 insertions, 5 deletions
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)) |