aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs8
-rwxr-xr-xOpenSim/Region/Application/OpenSimBase.cs4
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 50bad61..786a41c 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -783,7 +783,7 @@ namespace OpenSim
783 if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene)) 783 if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene))
784 { 784 {
785 MainConsole.Instance.Output( 785 MainConsole.Instance.Output(
786 "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}", null, 786 "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}",
787 regInfo.RegionName, regInfo.RegionID, existingScene.RegionInfo.RegionName); 787 regInfo.RegionName, regInfo.RegionID, existingScene.RegionInfo.RegionName);
788 788
789 return; 789 return;
@@ -980,7 +980,7 @@ namespace OpenSim
980 SceneManager.ForEachSelectedScene( 980 SceneManager.ForEachSelectedScene(
981 scene => 981 scene =>
982 { 982 {
983 MainConsole.Instance.Output("Loaded region modules in {0} are:", null, scene.Name); 983 MainConsole.Instance.Output("Loaded region modules in {0} are:", scene.Name);
984 984
985 List<IRegionModuleBase> sharedModules = new List<IRegionModuleBase>(); 985 List<IRegionModuleBase> sharedModules = new List<IRegionModuleBase>();
986 List<IRegionModuleBase> nonSharedModules = new List<IRegionModuleBase>(); 986 List<IRegionModuleBase> nonSharedModules = new List<IRegionModuleBase>();
@@ -994,10 +994,10 @@ namespace OpenSim
994 } 994 }
995 995
996 foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name)) 996 foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
997 MainConsole.Instance.Output("New Region Module (Shared): {0}", null, module.Name); 997 MainConsole.Instance.Output("New Region Module (Shared): {0}", module.Name);
998 998
999 foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name)) 999 foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name))
1000 MainConsole.Instance.Output("New Region Module (Non-Shared): {0}", null, module.Name); 1000 MainConsole.Instance.Output("New Region Module (Non-Shared): {0}", module.Name);
1001 } 1001 }
1002 ); 1002 );
1003 1003
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ed0f496..4f82a3b 100755
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -593,7 +593,7 @@ namespace OpenSim
593 estateOwnerPassword = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null); 593 estateOwnerPassword = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null);
594 } 594 }
595 595
596 MainConsole.Instance.Output("Estate {0} has no owner set.", null, regionInfo.EstateSettings.EstateName); 596 MainConsole.Instance.Output("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName);
597 List<char> excluded = new List<char>(new char[1]{' '}); 597 List<char> excluded = new List<char>(new char[1]{' '});
598 598
599 599
@@ -1003,7 +1003,7 @@ namespace OpenSim
1003 1003
1004 if (estatesByName.ContainsKey(newName)) 1004 if (estatesByName.ContainsKey(newName))
1005 { 1005 {
1006 MainConsole.Instance.Output("An estate named {0} already exists. Please try again.", null, newName); 1006 MainConsole.Instance.Output("An estate named {0} already exists. Please try again.", newName);
1007 return false; 1007 return false;
1008 } 1008 }
1009 1009