From 0fd17c08ae642fac17b24dfad06c61cfe5739483 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 20 Aug 2019 23:28:59 +0100 Subject: Massive console refactor. Greatly simplify interface. --- .../Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs | 2 +- .../OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs mode change 100644 => 100755 OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs (limited to 'OpenSim/Region/OptionalModules/Scripting') diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs old mode 100644 new mode 100755 index 9bf9cb0..ff30a5c --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs @@ -186,7 +186,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore return; JsonStoreStats stats = m_store.GetStoreStats(); - MainConsole.Instance.OutputFormat("{0}\t{1}",m_scene.RegionInfo.RegionName,stats.StoreCount); + MainConsole.Instance.Output("{0}\t{1}", null, m_scene.RegionInfo.RegionName, stats.StoreCount); } #endregion diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs old mode 100644 new mode 100755 index 732735e..7d95c7f --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs @@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady // This should always show up to the user but should not trigger warn/errors as these messages are // expected and are not simulator problems. Ideally, there would be a status level in log4net but // failing that, we will print out to console instead. - MainConsole.Instance.OutputFormat("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name); + MainConsole.Instance.Output("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", null, m_scene.Name); if (m_uri != string.Empty) { @@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady // without info log messages enabled. Making this a warning is arguably misleading since it isn't a // warning, and monitor scripts looking for warn/error/fatal messages will received false positives. // Arguably, log4net needs a status log level (like Apache). - MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); + MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", null, m_scene.Name); } m_scene.SceneGridService.InformNeighborsThatRegionisUp( -- cgit v1.1