Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge

2 files changed, 28 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 012f7e1..0e0c2b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2675,10 +2675,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// indices, and the tolerance for out-of-bound values, makes
         /// this more complicated than it might otherwise seem.
         /// </summary>
-
         public LSL_String llGetSubString(string src, int start, int end)
         {
-
             m_host.AddScriptLPS(1);
 
             // Normalize indices (if negative).
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 32d1fd3..572ca07 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -42,6 +42,7 @@ using log4net;
 using Nini.Config;
 using Amib.Threading;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -333,6 +334,33 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 OnScriptRemoved += m_XmlRpcRouter.ScriptRemoved;
                 OnObjectRemoved += m_XmlRpcRouter.ObjectRemoved;
             }
+
+            MainConsole.Instance.Commands.AddCommand(
+                "scripts", false, "scripts show", "scripts show", "Show script information",
+                "Show information on all scripts known to the script engine", HandleShowScripts);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "scripts", false, "show scripts", "show scripts", "Show script information",
+                "Synonym for scripts show command", HandleShowScripts);
+        }
+
+        public void HandleShowScripts(string module, string[] cmdparams)
+        {
+            lock (m_Scripts)
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Showing {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
+
+                foreach (IScriptInstance instance in m_Scripts.Values)
+                {
+                    SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
+
+                    MainConsole.Instance.OutputFormat(
+                        "{0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
+                        instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID,
+                        sop.AbsolutePosition, m_Scene.RegionInfo.RegionName);
+                }
+            }
         }
 
         public void RemoveRegion(Scene scene)