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

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
         //   will wait anyway)
         private Bitmap fetchTexture(UUID id)
         {
-            AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(id, true);
+            AssetBase asset = m_scene.AssetService.Get(id.ToString());
             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 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
                     imgstream = new MemoryStream();
 
                     // non-async because we know we have the asset immediately.
-                    AssetBase mapasset = m_scene.CommsManager.AssetCache.GetAsset(m_scene.RegionInfo.lastMapUUID, true);
+                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString());
 
                     // Decode image to System.Drawing.Image
                     if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
@@ -872,7 +872,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             foreach (MapBlockData mapBlock in mapBlocks)
             {
-                AssetBase texAsset = m_scene.CommsManager.AssetCache.GetAsset(mapBlock.MapImageId, true);
+                AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
 
                 if (texAsset != null)
                 {
@@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 }
                 else
                 {
-                    texAsset = m_scene.CommsManager.AssetCache.GetAsset(mapBlock.MapImageId, true);
+                    texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
                     if (texAsset != null)
                     {
                         textures.Add(texAsset);
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             asset.Type = 0;
             asset.Temporary = temporary;
-            m_scene.CommsManager.AssetCache.AddAsset(asset);
+            m_scene.AssetService.Store(asset);
         }
 
         private void MakeRootAgent(ScenePresence avatar)