aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-09-10 07:48:22 +0000
committerMW2007-09-10 07:48:22 +0000
commit22dbe82b26effea0c021a6eb9bffd58d58781c3f (patch)
tree3e777b3a5de66b0f4328b31bcc628040054f83cf
parentAdded "asset_database =" option to opensim.ini, so the asset database can be ... (diff)
downloadopensim-SC_OLD-22dbe82b26effea0c021a6eb9bffd58d58781c3f.zip
opensim-SC_OLD-22dbe82b26effea0c021a6eb9bffd58d58781c3f.tar.gz
opensim-SC_OLD-22dbe82b26effea0c021a6eb9bffd58d58781c3f.tar.bz2
opensim-SC_OLD-22dbe82b26effea0c021a6eb9bffd58d58781c3f.tar.xz
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.
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServer.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
3 files changed, 4 insertions, 2 deletions
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
49 49
50 public LocalAssetServer() 50 public LocalAssetServer()
51 { 51 {
52 System.Console.WriteLine("Starting Db4o asset storage system");
52 bool yapfile; 53 bool yapfile;
53 this._assetRequests = new BlockingQueue<ARequest>(); 54 this._assetRequests = new BlockingQueue<ARequest>();
54 yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap")); 55 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
49 49
50 public SQLAssetServer() 50 public SQLAssetServer()
51 { 51 {
52 System.Console.WriteLine("Starting sqlite asset storage system");
52 _assetRequests = new BlockingQueue<ARequest>(); 53 _assetRequests = new BlockingQueue<ARequest>();
53 AddPlugin("OpenSim.Framework.Data.SQLite.dll"); 54 AddPlugin("OpenSim.Framework.Data.SQLite.dll");
54 this.SetUpAssetDatabase(); 55 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
88 private string standaloneInventoryPlugin = ""; 88 private string standaloneInventoryPlugin = "";
89 private string standaloneUserPlugin = ""; 89 private string standaloneUserPlugin = "";
90 90
91 private string m_assetStorage = "sqlite"; 91 private string m_assetStorage = "db4o";
92 92
93 private Scene m_consoleRegion = null; 93 private Scene m_consoleRegion = null;
94 94
@@ -129,7 +129,7 @@ namespace OpenSim
129 129
130 m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine"); 130 m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
131 131
132 m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "sqlite"); 132 m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "db4o");
133 133
134 m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true); 134 m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true);
135 m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true); 135 m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);