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/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 2 +- .../CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | 2 +- OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs | 3 ++- .../CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 6 +++--- OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 2 +- .../CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 4 ++-- .../Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | 2 +- OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/CoreModules') 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 Caps caps = new Caps( - m_scene.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, + m_scene.CommsManager.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, m_scene.CommsManager.HttpServer.Port, capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); 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 TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); m_textureSenders.Add(e.RequestedAssetID, requestHandler); - m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); + m_scene.CommsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); } } } 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 protected void AddHttpHandlers(Scene m_scene) { - IAssetDataPlugin m_assetProvider = ((AssetServerBase)m_scene.AssetCache.AssetServer).AssetProviderPlugin; + IAssetDataPlugin m_assetProvider + = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; 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 if (BlendWithOldTexture) { UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; - oldAsset = scene.AssetCache.GetAsset(lastTextureID, true); + oldAsset = scene.CommsManager.AssetCache.GetAsset(lastTextureID, true); if (oldAsset != null) { assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha); @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture asset.Metadata.Description = "dynamic image"; asset.Metadata.Local = false; asset.Metadata.Temporary = true; - scene.AssetCache.AddAsset(asset); + scene.CommsManager.AssetCache.AddAsset(asset); LastAssetID = asset.Metadata.FullID; @@ -254,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture // remove the old asset from the cache UUID oldID = tmptex.DefaultTexture.TextureID; - scene.AssetCache.ExpireAsset(oldID); + scene.CommsManager.AssetCache.ExpireAsset(oldID); tmptex.DefaultTexture.TextureID = asset.Metadata.FullID; // 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 asset.Metadata.Type = assetType; asset.Data = data; - m_scene.AssetCache.AddAsset(asset); + m_scene.CommsManager.AssetCache.AddAsset(asset); /** * 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 protected AssetBase GetAsset(UUID uuid) { m_waitingForObjectAsset = true; - m_scene.AssetCache.GetAsset(uuid, AssetRequestCallback, true); + m_scene.CommsManager.AssetCache.GetAsset(uuid, AssetRequestCallback, true); // The asset cache callback can either // @@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene, m_saveStream); - new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); + new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); } } } 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 // will wait anyway) private Bitmap fetchTexture(UUID id) { - AssetBase asset = m_scene.AssetCache.GetAsset(id, true); + AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(id, true); m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null); if (asset == null) return null; 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 imgstream = new MemoryStream(); // non-async because we know we have the asset immediately. - AssetBase mapasset = m_scene.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true); + AssetBase mapasset = m_scene.CommsManager.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true); // Decode image to System.Drawing.Image if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image)) -- cgit v1.1