ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Massive console refactor. Greatly simplify interface.

Browse Source
This commit is contained in:
Melanie
2019-08-20 23:28:59 +01:00
parent f7a496136d
commit 0fd17c08ae
56 changed files with 430 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs Normal file → Executable file
View File

@@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
MainConsole.Instance.Output(cdt.ToString());
MainConsole.Instance.OutputFormat("Total: {0}", sensorInfo.Count);
MainConsole.Instance.Output("Total: {0}", null, 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.OutputFormat("Total: {0}", timersInfo.Count);
MainConsole.Instance.Output("Total: {0}", null, timersInfo.Count);
}
}
}

24
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -456,7 +456,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
si.DebugLevel = newLevel;
MainConsole.Instance.OutputFormat("Set debug level of {0} {1} to {2}", si.ScriptName, si.ItemID, newLevel);
MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", null, si.ScriptName, si.ItemID, newLevel);
}
/// <summary>
@@ -472,12 +472,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug))
{
DebugLevel = newDebug;
MainConsole.Instance.OutputFormat("Debug level set to {0} in XEngine for region {1}", newDebug, m_Scene.Name);
MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", null, newDebug, m_Scene.Name);
}
}
else if (args.Length == 3)
{
MainConsole.Instance.OutputFormat("Current debug level is {0}", DebugLevel);
MainConsole.Instance.Output("Current debug level is {0}", null, DebugLevel);
}
else
{
@@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (!UUID.TryParse(rawItemId, out itemId))
{
MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid UUID", rawItemId);
MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", null, rawItemId);
continue;
}
@@ -617,8 +617,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
lock (m_Scripts)
{
MainConsole.Instance.OutputFormat(
"Showing {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
MainConsole.Instance.Output(
"Showing {0} scripts in {1}", null, m_Scripts.Count, m_Scene.RegionInfo.RegionName);
}
}
@@ -669,8 +669,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.Suspend();
SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
null,
instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
}
}
@@ -682,8 +683,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.Resume();
SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
null,
instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
}
}
@@ -695,8 +697,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.Start();
SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
null,
instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
}
}
@@ -710,8 +713,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.Stop(0);
SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
null,
instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
}
}