Thanks, sempuki, for a patch that moves all Grid Server's plugins to

PluginLoader. Fix issue 1871.

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index f729d78..ed5b896 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications.Cache
         protected IAssetReceiver m_receiver;
         protected BlockingQueue<AssetRequest> m_assetRequests;
         protected Thread m_localAssetServerThread;
-        protected IAssetProvider m_assetProvider;
+        protected IAssetProviderPlugin m_assetProvider;
 
         // Temporarily hardcoded - should be a plugin
         protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 94a8509..2f72e11 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications.Cache
             AddPlugin(pluginName, connect);
         }
 
-        public SQLAssetServer(IAssetProvider assetProvider)
+        public SQLAssetServer(IAssetProviderPlugin assetProvider)
         {
             m_assetProvider = assetProvider;
         }
@@ -54,12 +54,12 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (!pluginType.IsAbstract)
                 {
-                    Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
+                    Type typeInterface = pluginType.GetInterface("IAssetProviderPlugin", true);
 
                     if (typeInterface != null)
                     {
-                        IAssetProvider plug =
-                            (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        IAssetProviderPlugin plug =
+                            (IAssetProviderPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         m_assetProvider = plug;
                         m_assetProvider.Initialise(connect);