diff options
| author | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
| commit | 93837807ffb24e5811368063b9231a9d8b018d9d (patch) | |
| tree | 5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
| parent | * Iniital inventory archive test code. Doesn't actually do any testing yet (diff) | |
| download | opensim-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/WorldMapModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |