aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
diff options
context:
space:
mode:
authorMike Mazur2009-02-16 02:25:36 +0000
committerMike Mazur2009-02-16 02:25:36 +0000
commit617016fa6870765d1799ba4c73731fcca30920ad (patch)
tree4173a7b3d3d52c63196439d678bd6d67abbf47d6 /OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
parentRename NewAssetServer AssetInventoryServer and fully qualify with (diff)
downloadopensim-SC_OLD-617016fa6870765d1799ba4c73731fcca30920ad.zip
opensim-SC_OLD-617016fa6870765d1799ba4c73731fcca30920ad.tar.gz
opensim-SC_OLD-617016fa6870765d1799ba4c73731fcca30920ad.tar.bz2
opensim-SC_OLD-617016fa6870765d1799ba4c73731fcca30920ad.tar.xz
Added OpenSim asset frontend plugin.
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 2c588f5..a769448 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -55,6 +55,8 @@ namespace OpenSim.Grid.AssetInventoryServer
55 public IAuthorizationProvider AuthorizationProvider; 55 public IAuthorizationProvider AuthorizationProvider;
56 public IMetricsProvider MetricsProvider; 56 public IMetricsProvider MetricsProvider;
57 57
58 private IAssetInventoryServerPlugin frontend;
59
58 public AssetInventoryServer() 60 public AssetInventoryServer()
59 { 61 {
60 this.ServiceName = "OpenSimAssetInventoryServer"; 62 this.ServiceName = "OpenSimAssetInventoryServer";
@@ -138,7 +140,7 @@ namespace OpenSim.Grid.AssetInventoryServer
138 // return false; 140 // return false;
139 //} 141 //}
140 142
141 StorageProvider = LoadAssetInventoryServerPlugin() as IAssetStorageProvider; 143 StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/StorageProvider") as IAssetStorageProvider;
142 144
143 try 145 try
144 { 146 {
@@ -151,6 +153,8 @@ namespace OpenSim.Grid.AssetInventoryServer
151 return false; 153 return false;
152 } 154 }
153 155
156 frontend = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/Frontend");
157
154 // Start all of the extensions 158 // Start all of the extensions
155 //foreach (IExtension<AssetServer> extension in ExtensionLoader<AssetServer>.Extensions) 159 //foreach (IExtension<AssetServer> extension in ExtensionLoader<AssetServer>.Extensions)
156 //{ 160 //{
@@ -215,13 +219,13 @@ namespace OpenSim.Grid.AssetInventoryServer
215 219
216 #endregion 220 #endregion
217 221
218 private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin() 222 private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin(string addinPath)
219 { 223 {
220 PluginLoader<IAssetInventoryServerPlugin> loader = new PluginLoader<IAssetInventoryServerPlugin>(new AssetInventoryServerPluginInitialiser(this)); 224 PluginLoader<IAssetInventoryServerPlugin> loader = new PluginLoader<IAssetInventoryServerPlugin>(new AssetInventoryServerPluginInitialiser(this));
221 225
222 //loader.Add ("/OpenSim/AssetInventoryServer/StorageProvider", new PluginProviderFilter (provider)); 226 //loader.Add ("/OpenSim/AssetInventoryServer/StorageProvider", new PluginProviderFilter (provider));
223 //loader.Add("/OpenSim/AssetInventoryServer/StorageProvider", new PluginCountConstraint(1)); 227 //loader.Add("/OpenSim/AssetInventoryServer/StorageProvider", new PluginCountConstraint(1));
224 loader.Add("/OpenSim/AssetInventoryServer/StorageProvider"); 228 loader.Add(addinPath);
225 loader.Load(); 229 loader.Load();
226 230
227 return loader.Plugin; 231 return loader.Plugin;