aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs8
-rw-r--r--OpenSim/Framework/IAssetProvider.cs4
3 files changed, 8 insertions, 8 deletions
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
43 protected IAssetReceiver m_receiver; 43 protected IAssetReceiver m_receiver;
44 protected BlockingQueue<AssetRequest> m_assetRequests; 44 protected BlockingQueue<AssetRequest> m_assetRequests;
45 protected Thread m_localAssetServerThread; 45 protected Thread m_localAssetServerThread;
46 protected IAssetProviderPlugin m_assetProvider; 46 protected IAssetDataPlugin m_assetProvider;
47 47
48 public IAssetProviderPlugin AssetProviderPlugin 48 public IAssetDataPlugin AssetProviderPlugin
49 { 49 {
50 get { return m_assetProvider; } 50 get { return m_assetProvider; }
51 } 51 }
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
40 AddPlugin(pluginName, connect); 40 AddPlugin(pluginName, connect);
41 } 41 }
42 42
43 public SQLAssetServer(IAssetProviderPlugin assetProvider) 43 public SQLAssetServer(IAssetDataPlugin assetProvider)
44 { 44 {
45 m_assetProvider = assetProvider; 45 m_assetProvider = assetProvider;
46 } 46 }
@@ -54,12 +54,12 @@ namespace OpenSim.Framework.Communications.Cache
54 { 54 {
55 if (!pluginType.IsAbstract) 55 if (!pluginType.IsAbstract)
56 { 56 {
57 Type typeInterface = pluginType.GetInterface("IAssetProviderPlugin", true); 57 Type typeInterface = pluginType.GetInterface("IAssetDataPlugin", true);
58 58
59 if (typeInterface != null) 59 if (typeInterface != null)
60 { 60 {
61 IAssetProviderPlugin plug = 61 IAssetDataPlugin plug =
62 (IAssetProviderPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 62 (IAssetDataPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
63 m_assetProvider = plug; 63 m_assetProvider = plug;
64 m_assetProvider.Initialise(connect); 64 m_assetProvider.Initialise(connect);
65 65
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;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public interface IAssetProviderPlugin : IPlugin 32 public interface IAssetDataPlugin : IPlugin
33 { 33 {
34 AssetBase FetchAsset(UUID uuid); 34 AssetBase FetchAsset(UUID uuid);
35 void CreateAsset(AssetBase asset); 35 void CreateAsset(AssetBase asset);
@@ -44,7 +44,7 @@ namespace OpenSim.Framework
44 public AssetDataInitialiser (string s) { connect = s; } 44 public AssetDataInitialiser (string s) { connect = s; }
45 public override void Initialise (IPlugin plugin) 45 public override void Initialise (IPlugin plugin)
46 { 46 {
47 IAssetProviderPlugin p = plugin as IAssetProviderPlugin; 47 IAssetDataPlugin p = plugin as IAssetDataPlugin;
48 p.Initialise (connect); 48 p.Initialise (connect);
49 } 49 }
50 } 50 }