ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Introduce a new "default" option for asset_database in the [STORAGE] section

Browse Source 
* This option makes OpenSim use the usual db based asset service in standalone, and the grid based one in grid mode
* The other options can (local, grid, etc) can still be used explicitly as before
* Also change OpenSim.ini.example and the surrounding explanative text
This commit is contained in:
Justin Clarke Casey
2009-02-04 18:56:12 +00:00
parent 3206f70cd9
commit a1da605706
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/Cache/FileAssetClient.cs
View File

@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Communications.Cache
}
m_dir = dir;
}
public override void StoreAsset(AssetBase asset)
{
byte[] idBytes = asset.Metadata.FullID.Guid.ToByteArray();

2
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -200,7 +200,7 @@ namespace OpenSim
config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty);
config.Set("DefaultScriptEngine", "XEngine");
config.Set("asset_database", "local");
config.Set("asset_database", "default");
config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
// life doesn't really work without this
config.Set("EventQueue", true);

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

@@ -269,8 +269,12 @@ 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")
if (m_configSettings.AssetStorage == "grid"
|| (m_configSettings.AssetStorage == "default" && false == m_configSettings.Standalone))
{
assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
}

1
OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
View File

@@ -495,6 +495,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
m_commander.ProcessConsoleCommand("help", new string[0]);
return;
}
string[] tmpArgs = new string[args.Length - 2];
int i;
for (i = 2; i < args.Length; i++)