aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs5
1 files changed, 3 insertions, 2 deletions
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;
47using OpenSim.Region.CoreModules.World.Terrain; 47using OpenSim.Region.CoreModules.World.Terrain;
48using OpenSim.Region.Framework.Interfaces; 48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 49using OpenSim.Region.Framework.Scenes;
50using OpenSim.Services.Interfaces;
50 51
51namespace OpenSim.ApplicationPlugins.RemoteController 52namespace OpenSim.ApplicationPlugins.RemoteController
52{ 53{
@@ -1421,7 +1422,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1421 1422
1422 UICallback uic; 1423 UICallback uic;
1423 IInventoryServices iserv = m_app.CommunicationsManager.InventoryService; 1424 IInventoryServices iserv = m_app.CommunicationsManager.InventoryService;
1424 IAssetCache aserv = m_app.CommunicationsManager.AssetCache; 1425 IAssetService aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService;
1425 1426
1426 doc.LoadXml(File.ReadAllText(dafn)); 1427 doc.LoadXml(File.ReadAllText(dafn));
1427 1428
@@ -1437,7 +1438,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1437 rass.Local = Boolean.Parse(GetStringAttribute(asset,"local","")); 1438 rass.Local = Boolean.Parse(GetStringAttribute(asset,"local",""));
1438 rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary","")); 1439 rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary",""));
1439 rass.Data = Convert.FromBase64String(asset.InnerText); 1440 rass.Data = Convert.FromBase64String(asset.InnerText);
1440 aserv.AddAsset(rass); 1441 aserv.Store(rass);
1441 } 1442 }
1442 1443
1443 avatars = doc.GetElementsByTagName("Avatar"); 1444 avatars = doc.GetElementsByTagName("Avatar");