From 669aa46bff3bf0ced71658b8782635ac4aef73e9 Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Wed, 11 Mar 2009 09:31:02 +0000
Subject: update some ini defaults in code - all defaults from beginning of
 OpenSim.ini.example thru DefaultScriptEngine = "XEngine"

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 2 +-
 OpenSim/Region/Application/OpenSim.cs             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6a103bd..7c335a7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -292,7 +292,7 @@ namespace OpenSim
                 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
                 m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
                 m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
-                m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin");
+                m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
 
             IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 69dfac5..d8a9b4c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -68,8 +68,8 @@ namespace OpenSim
 
             if (startupConfig != null)
             {
-                m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
-                m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
+                m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
+                m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "shutdown_commands.txt");
 
                 m_gui = startupConfig.GetBoolean("gui", false);
 
-- 
cgit v1.1