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.
parent
91cc820f34
commit
22dbe82b26
|
@ -49,6 +49,7 @@ namespace OpenSim.Framework.Communications.Caches
|
|||
|
||||
public LocalAssetServer()
|
||||
{
|
||||
System.Console.WriteLine("Starting Db4o asset storage system");
|
||||
bool yapfile;
|
||||
this._assetRequests = new BlockingQueue<ARequest>();
|
||||
yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
|
||||
|
|
|
@ -49,6 +49,7 @@ namespace OpenSim.Framework.Communications.Caches
|
|||
|
||||
public SQLAssetServer()
|
||||
{
|
||||
System.Console.WriteLine("Starting sqlite asset storage system");
|
||||
_assetRequests = new BlockingQueue<ARequest>();
|
||||
AddPlugin("OpenSim.Framework.Data.SQLite.dll");
|
||||
this.SetUpAssetDatabase();
|
||||
|
|
|
@ -88,7 +88,7 @@ namespace OpenSim
|
|||
private string standaloneInventoryPlugin = "";
|
||||
private string standaloneUserPlugin = "";
|
||||
|
||||
private string m_assetStorage = "sqlite";
|
||||
private string m_assetStorage = "db4o";
|
||||
|
||||
private Scene m_consoleRegion = null;
|
||||
|
||||
|
@ -129,7 +129,7 @@ namespace OpenSim
|
|||
|
||||
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_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);
|
||||
|
|
Loading…
Reference in New Issue