From 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d Mon Sep 17 00:00:00 2001
From: diva
Date: Fri, 15 May 2009 05:00:25 +0000
Subject: 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

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index e499f64..9a25faa 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -47,6 +47,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
@@ -1421,7 +1422,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     UICallback uic;
                     IInventoryServices iserv = m_app.CommunicationsManager.InventoryService;
-                    IAssetCache        aserv = m_app.CommunicationsManager.AssetCache;
+                    IAssetService      aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService;
 
                     doc.LoadXml(File.ReadAllText(dafn));
 
@@ -1437,7 +1438,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         rass.Local       = Boolean.Parse(GetStringAttribute(asset,"local",""));
                         rass.Temporary   = Boolean.Parse(GetStringAttribute(asset,"temporary",""));
                         rass.Data        = Convert.FromBase64String(asset.InnerText);
-                        aserv.AddAsset(rass);
+                        aserv.Store(rass);
                     }
 
                     avatars = doc.GetElementsByTagName("Avatar");
-- 
cgit v1.1