From 46e36601cb3c54e6e441284aed7c0c5c35970a4c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 22 Oct 2019 13:04:01 +0100 Subject: remove some more useless NULL arguments --- .../ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs | 4 ++-- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/XEngine') diff --git a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs index 01e35c1..d756f59 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs @@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } MainConsole.Instance.Output(cdt.ToString()); - MainConsole.Instance.Output("Total: {0}", null, sensorInfo.Count); + MainConsole.Instance.Output("Total: {0}", sensorInfo.Count); } private void HandleShowTimers(string module, string[] cmdparams) @@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } MainConsole.Instance.Output(cdt.ToString()); - MainConsole.Instance.Output("Total: {0}", null, timersInfo.Count); + MainConsole.Instance.Output("Total: {0}", timersInfo.Count); } } } \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index e4a41de..af82dc8 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -456,7 +456,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } si.DebugLevel = newLevel; - MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", null, si.ScriptName, si.ItemID, newLevel); + MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", si.ScriptName, si.ItemID, newLevel); } /// @@ -472,12 +472,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug)) { DebugLevel = newDebug; - MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", null, newDebug, m_Scene.Name); + MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", newDebug, m_Scene.Name); } } else if (args.Length == 3) { - MainConsole.Instance.Output("Current debug level is {0}", null, DebugLevel); + MainConsole.Instance.Output("Current debug level is {0}", DebugLevel); } else { @@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (!UUID.TryParse(rawItemId, out itemId)) { - MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", null, rawItemId); + MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", rawItemId); continue; } @@ -618,7 +618,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine lock (m_Scripts) { MainConsole.Instance.Output( - "Showing {0} scripts in {1}", null, m_Scripts.Count, m_Scene.RegionInfo.RegionName); + "Showing {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName); } } @@ -671,7 +671,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); MainConsole.Instance.Output( "Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", - null, instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); } } @@ -685,7 +684,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); MainConsole.Instance.Output( "Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", - null, instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); } } @@ -699,7 +697,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); MainConsole.Instance.Output( "Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", - null, instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); } } @@ -715,7 +712,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); MainConsole.Instance.Output( "Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", - null, instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); } } -- cgit v1.1