From f8e45e8e981bfd87f3765d7452046515e11a9345 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Tue, 3 Feb 2009 05:20:03 +0000 Subject: Rename IAssetProviderPlugin to IAssetDataPlugin aligning with the other data plugins. --- OpenSim/Framework/Communications/Cache/AssetServerBase.cs | 4 ++-- OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 8 ++++---- OpenSim/Framework/IAssetProvider.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 137bde9..7fb06b9 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -43,9 +43,9 @@ namespace OpenSim.Framework.Communications.Cache protected IAssetReceiver m_receiver; protected BlockingQueue m_assetRequests; protected Thread m_localAssetServerThread; - protected IAssetProviderPlugin m_assetProvider; + protected IAssetDataPlugin m_assetProvider; - public IAssetProviderPlugin AssetProviderPlugin + public IAssetDataPlugin AssetProviderPlugin { get { return m_assetProvider; } } diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 2f72e11..00dbad0 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(IAssetProviderPlugin assetProvider) + public SQLAssetServer(IAssetDataPlugin assetProvider) { m_assetProvider = assetProvider; } @@ -54,12 +54,12 @@ namespace OpenSim.Framework.Communications.Cache { if (!pluginType.IsAbstract) { - Type typeInterface = pluginType.GetInterface("IAssetProviderPlugin", true); + Type typeInterface = pluginType.GetInterface("IAssetDataPlugin", true); if (typeInterface != null) { - IAssetProviderPlugin plug = - (IAssetProviderPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); + IAssetDataPlugin plug = + (IAssetDataPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); m_assetProvider = plug; m_assetProvider.Initialise(connect); diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs index 4c86279..77e0d0c 100644 --- a/OpenSim/Framework/IAssetProvider.cs +++ b/OpenSim/Framework/IAssetProvider.cs @@ -29,7 +29,7 @@ using OpenMetaverse; namespace OpenSim.Framework { - public interface IAssetProviderPlugin : IPlugin + public interface IAssetDataPlugin : IPlugin { AssetBase FetchAsset(UUID uuid); void CreateAsset(AssetBase asset); @@ -44,7 +44,7 @@ namespace OpenSim.Framework public AssetDataInitialiser (string s) { connect = s; } public override void Initialise (IPlugin plugin) { - IAssetProviderPlugin p = plugin as IAssetProviderPlugin; + IAssetDataPlugin p = plugin as IAssetDataPlugin; p.Initialise (connect); } } -- cgit v1.1