ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
These changes replace all direct references to the AssetCache with
IAssetCache. There is no change to functionality. Everything works as
before.

This is laying the groundwork for making it possible to register
alternative asset caching mechanisms without disrupting other parts of
OpenSim or their dependencies upon AssetCache functionality.
This commit is contained in:
Sean Dague
2009-02-09 21:47:55 +00:00
parent 70051278c4
commit 8088802c21
27 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -309,37 +309,53 @@ namespace OpenSim
/// </summary>
protected virtual void InitialiseAssetCache()
{
// If the assetcache is set to default, then use the grid asset service in grid mode and the local database
// based asset service in standalone mode
IAssetServer assetServer;
if (m_configSettings.AssetStorage == "grid"
|| (m_configSettings.AssetStorage == "default" && false == m_configSettings.Standalone))
IAssetServer assetServer = null;
string mode = m_configSettings.AssetStorage;
if (m_configSettings.Standalone == false &&
m_configSettings.AssetStorage == "default")
mode = "grid";
switch (mode)
{
assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
}
else if (m_configSettings.AssetStorage == "cryptogrid") // Decrypt-Only
{
assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL,
case "grid" :
assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
break;
case "cryptogrid" :
assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL,
Environment.CurrentDirectory, true);
}
else if (m_configSettings.AssetStorage == "cryptogrid_eou") // Encrypts All Assets
{
assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL,
break;
case "cryptogrid_eou" :
assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL,
Environment.CurrentDirectory, false);
}
else if (m_configSettings.AssetStorage == "file")
{
assetServer = new FileAssetClient(m_networkServersInfo.AssetURL);
}
else
{
SQLAssetServer sqlAssetServer = new SQLAssetServer(m_configSettings.StandaloneAssetPlugin, m_configSettings.StandaloneAssetSource);
sqlAssetServer.LoadDefaultAssets(m_configSettings.AssetSetsXMLFile);
assetServer = sqlAssetServer;
break;
case "file" :
assetServer = new FileAssetClient(m_networkServersInfo.AssetURL);
break;
default :
if (!ResolveAssetServer(out assetServer))
{
SQLAssetServer sqlAssetServer = new SQLAssetServer(m_configSettings.StandaloneAssetPlugin, m_configSettings.StandaloneAssetSource);
sqlAssetServer.LoadDefaultAssets(m_configSettings.AssetSetsXMLFile);
assetServer = sqlAssetServer;
}
break;
}
m_assetCache = new AssetCache(assetServer);
m_assetCache = ResolveAssetCache(assetServer);
}
private bool ResolveAssetServer(out IAssetServer assetServer)
{
assetServer = null;
return false;
}
private IAssetCache ResolveAssetCache(IAssetServer assetServer)
{
return new AssetCache(assetServer);
}
public void ProcessLogin(bool LoginEnabled)