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.
This commit is contained in:
Sean Dague
2009-02-18 13:15:07 +00:00
parent 383f8b3ac6
commit 8ed631307b
4 changed files with 48 additions and 32 deletions

View File

@@ -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>

View File

@@ -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;