aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 7e320e6..3b261e7 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -231,6 +231,8 @@ namespace OpenSim
231 configSource.Alias.AddAlias("Off", false); 231 configSource.Alias.AddAlias("Off", false);
232 configSource.Alias.AddAlias("True", true); 232 configSource.Alias.AddAlias("True", true);
233 configSource.Alias.AddAlias("False", false); 233 configSource.Alias.AddAlias("False", false);
234 configSource.Alias.AddAlias("Yes", true);
235 configSource.Alias.AddAlias("No", false);
234 236
235 configSource.AddSwitch("Startup", "background"); 237 configSource.AddSwitch("Startup", "background");
236 configSource.AddSwitch("Startup", "inifile"); 238 configSource.AddSwitch("Startup", "inifile");
@@ -239,6 +241,8 @@ namespace OpenSim
239 configSource.AddSwitch("Startup", "physics"); 241 configSource.AddSwitch("Startup", "physics");
240 configSource.AddSwitch("Startup", "gui"); 242 configSource.AddSwitch("Startup", "gui");
241 configSource.AddSwitch("Startup", "console"); 243 configSource.AddSwitch("Startup", "console");
244 configSource.AddSwitch("Startup", "save_crashes");
245 configSource.AddSwitch("Startup", "crash_dir");
242 246
243 configSource.AddConfig("StandAlone"); 247 configSource.AddConfig("StandAlone");
244 configSource.AddConfig("Network"); 248 configSource.AddConfig("Network");
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 503123e..04a68ae 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -918,7 +918,7 @@ namespace OpenSim
918 918
919 if (regInfo.EstateSettings.EstateID == 0) // No record at all 919 if (regInfo.EstateSettings.EstateID == 0) // No record at all
920 { 920 {
921 MainConsole.Instance.OutputFormat("Region {0} is not part of an estate.", regInfo.RegionName); 921 m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
922 922
923 List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll(); 923 List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
924 List<string> estateNames = new List<string>(); 924 List<string> estateNames = new List<string>();
@@ -929,7 +929,7 @@ namespace OpenSim
929 { 929 {
930 if (estates.Count == 0) 930 if (estates.Count == 0)
931 { 931 {
932 MainConsole.Instance.Output("No existing estates found. You must create a new one."); 932 m_log.Info("[ESTATE] No existing estates found. You must create a new one.");
933 933
934 if (CreateEstate(regInfo, estateNames)) 934 if (CreateEstate(regInfo, estateNames))
935 break; 935 break;