aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-16 19:15:16 +0000
committerJustin Clarke Casey2009-02-16 19:15:16 +0000
commit93837807ffb24e5811368063b9231a9d8b018d9d (patch)
tree5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/CoreModules/World/WorldMap
parent* Iniital inventory archive test code. Doesn't actually do any testing yet (diff)
downloadopensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.zip
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
2 files changed, 2 insertions, 2 deletions
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))