diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs index 1ab8e26..8671b54 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | |||
@@ -170,7 +170,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
170 | // will wait anyway) | 170 | // will wait anyway) |
171 | private Bitmap fetchTexture(UUID id) | 171 | private Bitmap fetchTexture(UUID id) |
172 | { | 172 | { |
173 | AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(id, true); | 173 | AssetBase asset = m_scene.AssetService.Get(id.ToString()); |
174 | m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null); | 174 | m_log.DebugFormat("Fetched texture {0}, found: {1}", id, asset != null); |
175 | if (asset == null) return null; | 175 | if (asset == null) return null; |
176 | 176 | ||
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 30f35d0..a2bbb3e 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -774,7 +774,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
774 | imgstream = new MemoryStream(); | 774 | imgstream = new MemoryStream(); |
775 | 775 | ||
776 | // non-async because we know we have the asset immediately. | 776 | // non-async because we know we have the asset immediately. |
777 | AssetBase mapasset = m_scene.CommsManager.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true); | 777 | AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString()); |
778 | 778 | ||
779 | // Decode image to System.Drawing.Image | 779 | // Decode image to System.Drawing.Image |
780 | if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image)) | 780 | if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image)) |
@@ -872,7 +872,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
872 | 872 | ||
873 | foreach (MapBlockData mapBlock in mapBlocks) | 873 | foreach (MapBlockData mapBlock in mapBlocks) |
874 | { | 874 | { |
875 | AssetBase texAsset = m_scene.CommsManager.AssetCache.GetAsset(mapBlock.MapImageId, true); | 875 | AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); |
876 | 876 | ||
877 | if (texAsset != null) | 877 | if (texAsset != null) |
878 | { | 878 | { |
@@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
880 | } | 880 | } |
881 | else | 881 | else |
882 | { | 882 | { |
883 | texAsset = m_scene.CommsManager.AssetCache.GetAsset(mapBlock.MapImageId, true); | 883 | texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); |
884 | if (texAsset != null) | 884 | if (texAsset != null) |
885 | { | 885 | { |
886 | textures.Add(texAsset); | 886 | textures.Add(texAsset); |
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1029 | 1029 | ||
1030 | asset.Type = 0; | 1030 | asset.Type = 0; |
1031 | asset.Temporary = temporary; | 1031 | asset.Temporary = temporary; |
1032 | m_scene.CommsManager.AssetCache.AddAsset(asset); | 1032 | m_scene.AssetService.Store(asset); |
1033 | } | 1033 | } |
1034 | 1034 | ||
1035 | private void MakeRootAgent(ScenePresence avatar) | 1035 | private void MakeRootAgent(ScenePresence avatar) |