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 'OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | 6 |
1 files changed, 4 insertions, 2 deletions
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; | |||
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Services.Interfaces; | ||
38 | using IUserService = OpenSim.Framework.Communications.IUserService; | ||
37 | 39 | ||
38 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
39 | { | 41 | { |
@@ -110,9 +112,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
110 | get { return Comms.AvatarService; } | 112 | get { return Comms.AvatarService; } |
111 | } | 113 | } |
112 | 114 | ||
113 | internal static IAssetCache AssetServices | 115 | internal static IAssetService AssetServices |
114 | { | 116 | { |
115 | get { return Comms.AssetCache; } | 117 | get { return main.SceneManager.CurrentOrFirstScene.AssetService; } |
116 | } | 118 | } |
117 | 119 | ||
118 | /// <summary> | 120 | /// <summary> |