From: Alan Webb <awebb@linux.vnet.ibm.com>

I've changed the extension point name, and the internal references that
used the same string. I also fixed up the messaging around the asset
loader so that it is more explicit.

2 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml b/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
index 61a9f0f..2ac6dca 100644
--- a/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
+++ b/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
@@ -8,10 +8,10 @@
     <Extension path="/OpenSim/AssetCache">
         <Cache id="Default" provider="Default" type="OpenSim.Framework.Communications.Cache.AssetCache" />
     </Extension>
-    <Extension path="/OpenSim/AssetServerClient">
-        <ServerClient id="Crypto" provider="Crypto" type="OpenSim.Framework.Communications.Cache.CryptoGridAssetClient" />
-        <ServerClient id="Grid"   provider="Grid"   type="OpenSim.Framework.Communications.Cache.GridAssetClient" />
-        <ServerClient id="File"   provider="File"   type="OpenSim.Framework.Communications.Cache.FileAssetClient" />
-        <ServerClient id="SQL"    provider="SQL"    type="OpenSim.Framework.Communications.Cache.SQLAssetServer" />
+    <Extension path="/OpenSim/AssetClient">
+        <AssetClient id="Crypto" provider="Crypto" type="OpenSim.Framework.Communications.Cache.CryptoGridAssetClient" />
+        <AssetClient id="Grid"   provider="Grid"   type="OpenSim.Framework.Communications.Cache.GridAssetClient" />
+        <AssetClient id="File"   provider="File"   type="OpenSim.Framework.Communications.Cache.FileAssetClient" />
+        <AssetClient id="SQL"    provider="SQL"    type="OpenSim.Framework.Communications.Cache.SQLAssetServer" />
     </Extension>
 </Addin>
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 0d9afe9..f76d125 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Framework
         void AssetNotFound(UUID assetID, bool IsTexture);
     }
 
-    public class AssetServerClientPluginInitialiser : PluginInitialiserBase
+    public class AssetClientPluginInitialiser : PluginInitialiserBase
     {
         private ConfigSettings config;
 
-        public AssetServerClientPluginInitialiser (ConfigSettings p_sv)
+        public AssetClientPluginInitialiser (ConfigSettings p_sv)
         {
             config = p_sv;
         }
@@ -80,12 +80,12 @@ namespace OpenSim.Framework
         }
     }
 
-    public class LegacyAssetServerClientPluginInitialiser : PluginInitialiserBase
+    public class LegacyAssetClientPluginInitialiser : PluginInitialiserBase
     {
         private ConfigSettings config;
         private string assetURL;
 
-        public LegacyAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url)
+        public LegacyAssetClientPluginInitialiser (ConfigSettings p_sv, string p_url)
         {
             config   = p_sv;
             assetURL = p_url;
@@ -97,14 +97,14 @@ namespace OpenSim.Framework
         }
     }
 
-    public class CryptoAssetServerClientPluginInitialiser : PluginInitialiserBase
+    public class CryptoAssetClientPluginInitialiser : PluginInitialiserBase
     {
         private ConfigSettings config;
         private string assetURL;
         private string currdir;
         private bool   test;
 
-        public CryptoAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url, string p_dir, bool p_test)
+        public CryptoAssetClientPluginInitialiser (ConfigSettings p_sv, string p_url, string p_dir, bool p_test)
         {
             config   = p_sv;
             assetURL = p_url;