diff options
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs index e51f559..e100377 100644 --- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs +++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
50 | public IniConfigSource ConfigFile; | 50 | public IniConfigSource ConfigFile; |
51 | 51 | ||
52 | public IAssetStorageProvider StorageProvider; | 52 | public IAssetStorageProvider StorageProvider; |
53 | public IInventoryProvider InventoryProvider; | 53 | public IInventoryStorageProvider InventoryProvider; |
54 | public IAuthenticationProvider AuthenticationProvider; | 54 | public IAuthenticationProvider AuthenticationProvider; |
55 | public IAuthorizationProvider AuthorizationProvider; | 55 | public IAuthorizationProvider AuthorizationProvider; |
56 | public IMetricsProvider MetricsProvider; | 56 | public IMetricsProvider MetricsProvider; |
@@ -107,7 +107,8 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
107 | } | 107 | } |
108 | 108 | ||
109 | StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/StorageProvider", "OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll") as IAssetStorageProvider; | 109 | StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/StorageProvider", "OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll") as IAssetStorageProvider; |
110 | MetricsProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/MetricsProvider", "") as IMetricsProvider; | 110 | InventoryProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/InventoryProvider", "OpenSim.Grid.AssetInventoryServer.Plugins.Simple.dll") as IInventoryStorageProvider; |
111 | MetricsProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/MetricsProvider", String.Empty) as IMetricsProvider; | ||
111 | 112 | ||
112 | try | 113 | try |
113 | { | 114 | { |
@@ -120,7 +121,7 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
120 | return false; | 121 | return false; |
121 | } | 122 | } |
122 | 123 | ||
123 | frontend = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/Frontend", ""); | 124 | frontend = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/Frontend", String.Empty); |
124 | 125 | ||
125 | return true; | 126 | return true; |
126 | } | 127 | } |