diff options
author | Melanie | 2019-08-20 23:28:59 +0100 |
---|---|---|
committer | Melanie | 2019-08-20 23:28:59 +0100 |
commit | 0fd17c08ae642fac17b24dfad06c61cfe5739483 (patch) | |
tree | 4871c96eab2f5b118cb09d670a3a4ba024cf1210 /OpenSim/Region/Application/OpenSim.cs | |
parent | change PGSQL migration (diff) | |
download | opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.zip opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.gz opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.bz2 opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.xz |
Massive console refactor. Greatly simplify interface.
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Region/Application/OpenSim.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index ee4ddf4..6a56a36 100644..100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -782,8 +782,8 @@ namespace OpenSim | |||
782 | Scene existingScene; | 782 | Scene existingScene; |
783 | if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene)) | 783 | if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene)) |
784 | { | 784 | { |
785 | MainConsole.Instance.OutputFormat( | 785 | MainConsole.Instance.Output( |
786 | "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}", | 786 | "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}", null, |
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.OutputFormat("Loaded region modules in {0} are:", scene.Name); | 983 | MainConsole.Instance.Output("Loaded region modules in {0} are:", null, 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.OutputFormat("New Region Module (Shared): {0}", module.Name); | 997 | MainConsole.Instance.Output("New Region Module (Shared): {0}", null, 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.OutputFormat("New Region Module (Non-Shared): {0}", module.Name); | 1000 | MainConsole.Instance.Output("New Region Module (Non-Shared): {0}", null, module.Name); |
1001 | } | 1001 | } |
1002 | ); | 1002 | ); |
1003 | 1003 | ||