aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorSean Dague2008-04-23 15:15:11 +0000
committerSean Dague2008-04-23 15:15:11 +0000
commitd52fc2dc1a73a91ca26a2ab3a8c669f132bba3c2 (patch)
treef0669fd1249926e637800cecf8e251ddc143a8ea /OpenSim/Region/Application
parentThank you kindly, Tyre for : (diff)
downloadopensim-SC_OLD-d52fc2dc1a73a91ca26a2ab3a8c669f132bba3c2.zip
opensim-SC_OLD-d52fc2dc1a73a91ca26a2ab3a8c669f132bba3c2.tar.gz
opensim-SC_OLD-d52fc2dc1a73a91ca26a2ab3a8c669f132bba3c2.tar.bz2
opensim-SC_OLD-d52fc2dc1a73a91ca26a2ab3a8c669f132bba3c2.tar.xz
Two small changes:
1. add addin-db-001 to the delete list 2. allow for connection strings for data sources in the config file
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 26ae525..ad0ee45 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -90,6 +90,9 @@ namespace OpenSim
90 private string m_standaloneInventoryPlugin; 90 private string m_standaloneInventoryPlugin;
91 private string m_standaloneAssetPlugin; 91 private string m_standaloneAssetPlugin;
92 private string m_standaloneUserPlugin; 92 private string m_standaloneUserPlugin;
93 private string m_standaloneInventorySource;
94 private string m_standaloneAssetSource;
95 private string m_standaloneUserSource;
93 96
94 private string m_assetStorage = "local"; 97 private string m_assetStorage = "local";
95 98
@@ -140,9 +143,10 @@ namespace OpenSim
140 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) occasionally seems to corrupt its addin cache 143 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) occasionally seems to corrupt its addin cache
141 // Hence, as a temporary solution we'll remove it before each startup 144 // Hence, as a temporary solution we'll remove it before each startup
142 if (Directory.Exists("addin-db-000")) 145 if (Directory.Exists("addin-db-000"))
143 {
144 Directory.Delete("addin-db-000", true); 146 Directory.Delete("addin-db-000", true);
145 } 147
148 if (Directory.Exists("addin-db-001"))
149 Directory.Delete("addin-db-001", true);
146 150
147 151
148 m_log.Info("[OPENSIM MAIN]: PLEASE IGNORE THE SCANNING ERRORS BELOW. These are the result of a temporary problem with our plugins manager."); 152 m_log.Info("[OPENSIM MAIN]: PLEASE IGNORE THE SCANNING ERRORS BELOW. These are the result of a temporary problem with our plugins manager.");
@@ -210,8 +214,11 @@ namespace OpenSim
210 config.Set("accounts_authenticate", false); 214 config.Set("accounts_authenticate", false);
211 config.Set("welcome_message", "Welcome to OpenSim"); 215 config.Set("welcome_message", "Welcome to OpenSim");
212 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); 216 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
217 config.Set("inventory_source", "");
213 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 218 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
219 config.Set("user_source", "");
214 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); 220 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
221 config.Set("asset_source", "");
215 config.Set("dump_assets_to_file", false); 222 config.Set("dump_assets_to_file", false);
216 } 223 }
217 224
@@ -299,10 +306,16 @@ namespace OpenSim
299 m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); 306 m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim");
300 m_standaloneInventoryPlugin = 307 m_standaloneInventoryPlugin =
301 standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll"); 308 standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll");
309 m_standaloneInventorySource =
310 standaloneConfig.GetString("inventory_source","");
302 m_standaloneUserPlugin = 311 m_standaloneUserPlugin =
303 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 312 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
313 m_standaloneUserSource =
314 standaloneConfig.GetString("user_source","");
304 m_standaloneAssetPlugin = 315 m_standaloneAssetPlugin =
305 standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll"); 316 standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll");
317 m_standaloneAssetSource =
318 standaloneConfig.GetString("asset_source","");
306 319
307 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); 320 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
308 } 321 }