From 22dbe82b26effea0c021a6eb9bffd58d58781c3f Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 10 Sep 2007 07:48:22 +0000
Subject: 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.

---
 OpenSim/Framework/Communications/Cache/AssetServer.cs    | 1 +
 OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 1 +
 OpenSim/Region/Application/OpenSimMain.cs                | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 4e2644c..7412190 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -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"));
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 50653d8..ac22573 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -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();
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index ea2e2ff..99c5e73 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -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);
-- 
cgit v1.1