aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fd3a57f..1b8ed45 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -94,7 +94,7 @@ namespace OpenSim
94 private string m_standaloneAssetPlugin; 94 private string m_standaloneAssetPlugin;
95 private string m_standaloneUserPlugin; 95 private string m_standaloneUserPlugin;
96 96
97 private string m_assetStorage = "sqlite"; 97 private string m_assetStorage = "local";
98 98
99 private string m_timedScript = "disabled"; 99 private string m_timedScript = "disabled";
100 private Timer m_scriptTimer; 100 private Timer m_scriptTimer;
@@ -278,7 +278,7 @@ namespace OpenSim
278 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 278 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
279 279
280 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 280 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
281 m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); 281 m_assetStorage = startupConfig.GetString("asset_database", "local");
282 282
283 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 283 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
284 } 284 }
@@ -429,13 +429,6 @@ namespace OpenSim
429 { 429 {
430 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL); 430 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
431 } 431 }
432 else if (m_assetStorage == "mssql")
433 {
434 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
435 sqlAssetServer.LoadDefaultAssets();
436 assetServer = sqlAssetServer;
437 //assetServer = new GridAssetClient(String.Empty);
438 }
439 else 432 else
440 { 433 {
441 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin); 434 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin);
@@ -444,7 +437,6 @@ namespace OpenSim
444 } 437 }
445 438
446 m_assetCache = new AssetCache(assetServer); 439 m_assetCache = new AssetCache(assetServer);
447 // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
448 440
449 m_sceneManager.OnRestartSim += handleRestartRegion; 441 m_sceneManager.OnRestartSim += handleRestartRegion;
450 } 442 }