diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs | 4 | ||||
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 14 |
2 files changed, 7 insertions, 11 deletions
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 | |||
89 | } | 89 | } |
90 | 90 | ||
91 | MainConsole.Instance.Output(cdt.ToString()); | 91 | MainConsole.Instance.Output(cdt.ToString()); |
92 | MainConsole.Instance.Output("Total: {0}", null, sensorInfo.Count); | 92 | MainConsole.Instance.Output("Total: {0}", sensorInfo.Count); |
93 | } | 93 | } |
94 | 94 | ||
95 | private void HandleShowTimers(string module, string[] cmdparams) | 95 | private void HandleShowTimers(string module, string[] cmdparams) |
@@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
120 | } | 120 | } |
121 | 121 | ||
122 | MainConsole.Instance.Output(cdt.ToString()); | 122 | MainConsole.Instance.Output(cdt.ToString()); |
123 | MainConsole.Instance.Output("Total: {0}", null, timersInfo.Count); | 123 | MainConsole.Instance.Output("Total: {0}", timersInfo.Count); |
124 | } | 124 | } |
125 | } | 125 | } |
126 | } \ No newline at end of file | 126 | } \ 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 | |||
456 | } | 456 | } |
457 | 457 | ||
458 | si.DebugLevel = newLevel; | 458 | si.DebugLevel = newLevel; |
459 | MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", null, si.ScriptName, si.ItemID, newLevel); | 459 | MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", si.ScriptName, si.ItemID, newLevel); |
460 | } | 460 | } |
461 | 461 | ||
462 | /// <summary> | 462 | /// <summary> |
@@ -472,12 +472,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
472 | if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug)) | 472 | if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug)) |
473 | { | 473 | { |
474 | DebugLevel = newDebug; | 474 | DebugLevel = newDebug; |
475 | MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", null, newDebug, m_Scene.Name); | 475 | MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", newDebug, m_Scene.Name); |
476 | } | 476 | } |
477 | } | 477 | } |
478 | else if (args.Length == 3) | 478 | else if (args.Length == 3) |
479 | { | 479 | { |
480 | MainConsole.Instance.Output("Current debug level is {0}", null, DebugLevel); | 480 | MainConsole.Instance.Output("Current debug level is {0}", DebugLevel); |
481 | } | 481 | } |
482 | else | 482 | else |
483 | { | 483 | { |
@@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
532 | 532 | ||
533 | if (!UUID.TryParse(rawItemId, out itemId)) | 533 | if (!UUID.TryParse(rawItemId, out itemId)) |
534 | { | 534 | { |
535 | MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", null, rawItemId); | 535 | MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", rawItemId); |
536 | continue; | 536 | continue; |
537 | } | 537 | } |
538 | 538 | ||
@@ -618,7 +618,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
618 | lock (m_Scripts) | 618 | lock (m_Scripts) |
619 | { | 619 | { |
620 | MainConsole.Instance.Output( | 620 | MainConsole.Instance.Output( |
621 | "Showing {0} scripts in {1}", null, m_Scripts.Count, m_Scene.RegionInfo.RegionName); | 621 | "Showing {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName); |
622 | } | 622 | } |
623 | } | 623 | } |
624 | 624 | ||
@@ -671,7 +671,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
671 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 671 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
672 | MainConsole.Instance.Output( | 672 | MainConsole.Instance.Output( |
673 | "Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", | 673 | "Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", |
674 | null, | ||
675 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); | 674 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); |
676 | } | 675 | } |
677 | } | 676 | } |
@@ -685,7 +684,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
685 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 684 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
686 | MainConsole.Instance.Output( | 685 | MainConsole.Instance.Output( |
687 | "Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", | 686 | "Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", |
688 | null, | ||
689 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); | 687 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); |
690 | } | 688 | } |
691 | } | 689 | } |
@@ -699,7 +697,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
699 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 697 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
700 | MainConsole.Instance.Output( | 698 | MainConsole.Instance.Output( |
701 | "Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", | 699 | "Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", |
702 | null, | ||
703 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); | 700 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); |
704 | } | 701 | } |
705 | } | 702 | } |
@@ -715,7 +712,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
715 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 712 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
716 | MainConsole.Instance.Output( | 713 | MainConsole.Instance.Output( |
717 | "Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", | 714 | "Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", |
718 | null, | ||
719 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); | 715 | instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); |
720 | } | 716 | } |
721 | } | 717 | } |