OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A couple of fixes to make sure db4o gets set as the default asset database. Also added a couple of console output lines to try to make it easier to tell which asset storage system is in use.

afrisby
MW 2007-09-10 07:48:22 +00:00
parent 91cc820f34
commit 22dbe82b26
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ namespace OpenSim.Framework.Communications.Caches
public LocalAssetServer() public LocalAssetServer()
{ {
System.Console.WriteLine("Starting Db4o asset storage system");
bool yapfile; bool yapfile;
this._assetRequests = new BlockingQueue<ARequest>(); this._assetRequests = new BlockingQueue<ARequest>();
yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap")); yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));

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

@ -49,6 +49,7 @@ namespace OpenSim.Framework.Communications.Caches
public SQLAssetServer() public SQLAssetServer()
{ {
System.Console.WriteLine("Starting sqlite asset storage system");
_assetRequests = new BlockingQueue<ARequest>(); _assetRequests = new BlockingQueue<ARequest>();
AddPlugin("OpenSim.Framework.Data.SQLite.dll"); AddPlugin("OpenSim.Framework.Data.SQLite.dll");
this.SetUpAssetDatabase(); this.SetUpAssetDatabase();

4
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim
private string standaloneInventoryPlugin = ""; private string standaloneInventoryPlugin = "";
private string standaloneUserPlugin = ""; private string standaloneUserPlugin = "";
private string m_assetStorage = "sqlite"; private string m_assetStorage = "db4o";
private Scene m_consoleRegion = null; private Scene m_consoleRegion = null;
@ -129,7 +129,7 @@ namespace OpenSim
m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine"); m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "sqlite"); m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "db4o");
m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true); m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true);
m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true); m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);