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/Rest/Inventory/Rest.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs')

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 748f20a..5d58c6a 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -34,6 +34,8 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Services.Interfaces;
+using IUserService = OpenSim.Framework.Communications.IUserService;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
@@ -110,9 +112,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             get { return Comms.AvatarService; }
         }
 
-        internal static IAssetCache AssetServices
+        internal static IAssetService AssetServices
         {
-            get { return Comms.AssetCache; }
+            get { return main.SceneManager.CurrentOrFirstScene.AssetService; }
         }
 
         /// <summary>
-- 
cgit v1.1