Rename IAssetProviderPlugin to IAssetDataPlugin aligning with the other data plugins.

2 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 72300b5..b5c8df0 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Grid.AssetServer
         // Temporarily hardcoded - should be a plugin
         protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
 
-        private IAssetProviderPlugin m_assetProvider;
+        private IAssetDataPlugin m_assetProvider;
 
         public static void Main(string[] args)
         {
@@ -111,10 +111,10 @@ namespace OpenSim.Grid.AssetServer
             return null;
         }
 
-        public IAssetProviderPlugin LoadDatabasePlugin(string provider, string connect)
+        public IAssetDataPlugin LoadDatabasePlugin(string provider, string connect)
         {
-            PluginLoader<IAssetProviderPlugin> loader =
-                new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
+            PluginLoader<IAssetDataPlugin> loader =
+                new PluginLoader<IAssetDataPlugin> (new AssetDataInitialiser (connect));
 
             // loader will try to load all providers (MySQL, MSSQL, etc)
             // unless it is constrainted to the correct "Provider" entry in the addin.xml
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 7b5b334..e81cb3f 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Grid.AssetServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // private OpenAsset_Main m_assetManager;
-        private IAssetProviderPlugin m_assetProvider;
+        private IAssetDataPlugin m_assetProvider;
 
         /// <summary>
         /// Constructor.
         /// </summary>
         /// <param name="assetManager"></param>
         /// <param name="assetProvider"></param>
-        public GetAssetStreamHandler(IAssetProviderPlugin assetProvider)
+        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
             : base("GET", "/assets")
         {
             m_log.Info("[REST]: In Get Request");
@@ -125,7 +125,7 @@ namespace OpenSim.Grid.AssetServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // private OpenAsset_Main m_assetManager;
-        private IAssetProviderPlugin m_assetProvider;
+        private IAssetDataPlugin m_assetProvider;
 
         public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.AssetServer
             return new byte[] {};
         }
 
-        public PostAssetStreamHandler(IAssetProviderPlugin assetProvider)
+        public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
             : base("POST", "/assets")
         {
             // m_assetManager = assetManager;