aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorSean Dague2007-10-31 14:41:04 +0000
committerSean Dague2007-10-31 14:41:04 +0000
commite729accdaccb1da5d30151e4383e2377089b83e8 (patch)
treedb8df35281f33593a40e3cc688ad709619ef830f /OpenSim/Region/Application
parentfix typo in filename (diff)
downloadopensim-SC_OLD-e729accdaccb1da5d30151e4383e2377089b83e8.zip
opensim-SC_OLD-e729accdaccb1da5d30151e4383e2377089b83e8.tar.gz
opensim-SC_OLD-e729accdaccb1da5d30151e4383e2377089b83e8.tar.bz2
opensim-SC_OLD-e729accdaccb1da5d30151e4383e2377089b83e8.tar.xz
redefault to sqlite for all services, especially now that
we can run without a config file
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index aec9500..aabd471 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -79,9 +79,9 @@ namespace OpenSim
79 private string m_standaloneWelcomeMessage = null; 79 private string m_standaloneWelcomeMessage = null;
80 private string m_standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; 80 private string m_standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
81 private string m_standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll"; 81 private string m_standaloneAssetPlugin = "OpenSim.Framework.Data.SQLite.dll";
82 private string m_standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll"; 82 private string m_standaloneUserPlugin = "OpenSim.Framework.Data.SQLite.dll";
83 83
84 private string m_assetStorage = "db4o"; 84 private string m_assetStorage = "sqlite";
85 85
86 public ConsoleCommand CreateAccount = null; 86 public ConsoleCommand CreateAccount = null;
87 private bool m_dumpAssetsToFile; 87 private bool m_dumpAssetsToFile;
@@ -199,7 +199,7 @@ namespace OpenSim
199 199
200 m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); 200 m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine");
201 201
202 m_assetStorage = startupConfig.GetString("asset_database", "db4o"); 202 m_assetStorage = startupConfig.GetString("asset_database", "sqlite");
203 } 203 }
204 204
205 IConfig standaloneConfig = m_config.Configs["StandAlone"]; 205 IConfig standaloneConfig = m_config.Configs["StandAlone"];
@@ -210,7 +210,7 @@ namespace OpenSim
210 m_standaloneInventoryPlugin = 210 m_standaloneInventoryPlugin =
211 standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); 211 standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
212 m_standaloneUserPlugin = 212 m_standaloneUserPlugin =
213 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); 213 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll");
214 m_standaloneAssetPlugin = 214 m_standaloneAssetPlugin =
215 standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); 215 standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll");
216 216