aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-09-10 07:23:43 +0000
committerMW2007-09-10 07:23:43 +0000
commit91cc820f34cef19e1bb9659faf2d6c7070dcda96 (patch)
tree22ab9f33f9fd910ddcfc9b2e4cd6b9e2191c69ad /OpenSim/Region
parenthooked up sdague new sqlite asset database provider to the old asset system. ... (diff)
downloadopensim-SC_OLD-91cc820f34cef19e1bb9659faf2d6c7070dcda96.zip
opensim-SC_OLD-91cc820f34cef19e1bb9659faf2d6c7070dcda96.tar.gz
opensim-SC_OLD-91cc820f34cef19e1bb9659faf2d6c7070dcda96.tar.bz2
opensim-SC_OLD-91cc820f34cef19e1bb9659faf2d6c7070dcda96.tar.xz
Added "asset_database =" option to opensim.ini, so the asset database can be selected. Currently set default back to db4o until more people test using sqlite.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs15
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 8437933..ea2e2ff 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -88,6 +88,8 @@ 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";
92
91 private Scene m_consoleRegion = null; 93 private Scene m_consoleRegion = null;
92 94
93 public ConsoleCommand CreateAccount = null; 95 public ConsoleCommand CreateAccount = null;
@@ -127,6 +129,8 @@ namespace OpenSim
127 129
128 m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine"); 130 m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
129 131
132 m_assetStorage = configSource.Configs["Startup"].GetString("asset_database", "sqlite");
133
130 m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true); 134 m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true);
131 m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true); 135 m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);
132 m_exceptModules = configSource.Configs["Startup"].GetString("except_modules", ""); 136 m_exceptModules = configSource.Configs["Startup"].GetString("except_modules", "");
@@ -266,8 +270,15 @@ namespace OpenSim
266 { 270 {
267 m_httpServerPort = m_networkServersInfo.HttpListenerPort; 271 m_httpServerPort = m_networkServersInfo.HttpListenerPort;
268 272
269 // LocalAssetServer assetServer = new LocalAssetServer(); 273 IAssetServer assetServer;
270 SQLAssetServer assetServer = new SQLAssetServer(); 274 if (m_assetStorage == "db4o")
275 {
276 assetServer = new LocalAssetServer();
277 }
278 else
279 {
280 assetServer = new SQLAssetServer();
281 }
271 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); 282 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
272 m_assetCache = new AssetCache(assetServer); 283 m_assetCache = new AssetCache(assetServer);
273 // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); 284 // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);