3 files changed, 81 insertions, 35 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 37422d7..dd45406 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -61,19 +61,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             public SensorInfo Clone()
             {
-                SensorInfo s = new SensorInfo();
-                s.localID = localID;
-                s.itemID = itemID;
-                s.interval = interval;
-                s.next = next;
-                s.name = name;
-                s.keyID = keyID;
-                s.type = type;
-                s.range = range;
-                s.arc = arc;
-                s.host = host;
-
-                return s;
+                return (SensorInfo)this.MemberwiseClone();
             }
         }
 
@@ -701,8 +689,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             lock (SenseRepeatListLock)
             {
-                foreach (SensorInfo si in SenseRepeaters)
-                    retList.Add(si.Clone());
+                foreach (SensorInfo i in SenseRepeaters)
+                    retList.Add(i.Clone());
             }
 
             return retList;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index bc63030..0b14565 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -35,6 +35,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 {
     public class Timer
     {
+        public class TimerInfo
+        {
+            public uint localID;
+            public UUID itemID;
+            //public double interval;
+            public long interval;
+            //public DateTime next;
+            public long next;
+
+            public TimerInfo Clone()
+            {
+                return (TimerInfo)this.MemberwiseClone();
+            }
+        }
+
         public AsyncCommandManager m_CmdManager;
 
         public int TimersCount
@@ -59,17 +74,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             return localID.ToString() + itemID.ToString();
         }
 
-        private class TimerClass
-        {
-            public uint localID;
-            public UUID itemID;
-            //public double interval;
-            public long interval;
-            //public DateTime next;
-            public long next;
-        }
-
-        private Dictionary<string,TimerClass> Timers = new Dictionary<string,TimerClass>();
+        private Dictionary<string,TimerInfo> Timers = new Dictionary<string,TimerInfo>();
         private object TimerListLock = new object();
 
         public void SetTimerEvent(uint m_localID, UUID m_itemID, double sec)
@@ -81,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             }
 
             // Add to timer
-            TimerClass ts = new TimerClass();
+            TimerInfo ts = new TimerInfo();
             ts.localID = m_localID;
             ts.itemID = m_itemID;
             ts.interval = Convert.ToInt64(sec * 10000000); // How many 100 nanoseconds (ticks) should we wait
@@ -121,8 +126,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             lock (TimerListLock)
             {
                 // Go through all timers
-                Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values;
-                foreach (TimerClass ts in tvals)
+                Dictionary<string, TimerInfo>.ValueCollection tvals = Timers.Values;
+                foreach (TimerInfo ts in tvals)
                 {
                     // Time has passed?
                     if (ts.next < DateTime.Now.Ticks)
@@ -147,8 +152,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             lock (TimerListLock)
             {
-                Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values;
-                foreach (TimerClass ts in tvals)
+                Dictionary<string, TimerInfo>.ValueCollection tvals = Timers.Values;
+                foreach (TimerInfo ts in tvals)
                 {
                     if (ts.itemID == itemID)
                     {
@@ -167,7 +172,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             while (idx < data.Length)
             {
-                TimerClass ts = new TimerClass();
+                TimerInfo ts = new TimerInfo();
 
                 ts.localID = localID;
                 ts.itemID = itemID;
@@ -181,5 +186,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 }
             }
         }
+
+        public List<TimerInfo> GetTimersInfo()
+        {
+            List<TimerInfo> retList = new List<TimerInfo>();
+
+            lock (TimerListLock)
+            {
+                foreach (TimerInfo i in Timers.Values)
+                    retList.Add(i.Clone());
+            }
+
+            return retList;
+        }  
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
index e47917d..efb854d 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
@@ -47,20 +47,29 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public void RegisterCommands()
         {
             MainConsole.Instance.Commands.AddCommand(
-                "Scripts", false, "show sensors", "show sensors", "Show script sensors information",
+                "Scripts", false, "show script sensors", "show script sensors", "Show script sensors information",
                 HandleShowSensors);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Scripts", false, "show script timers", "show script timers", "Show script sensors information",
+                HandleShowTimers);
+        }
+
+        private bool IsSceneSelected()
+        {
+            return MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_engine.World;
         }
 
         private void HandleShowSensors(string module, string[] cmdparams)
         {
-            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_engine.World))
+            if (!IsSceneSelected())
                 return;
 
             SensorRepeat sr = AsyncCommandManager.GetSensorRepeatPlugin(m_engine);
 
             if (sr == null)
             {
-                MainConsole.Instance.Output("Sensor plugin not yet initialized");
+                MainConsole.Instance.Output("Plugin not yet initialized");
                 return;
             }
 
@@ -82,5 +91,36 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             MainConsole.Instance.Output(cdt.ToString());
             MainConsole.Instance.OutputFormat("Total: {0}", sensorInfo.Count);
         }
+
+        private void HandleShowTimers(string module, string[] cmdparams)
+        {
+            if (!IsSceneSelected())
+                return;
+
+            Timer timerPlugin = AsyncCommandManager.GetTimerPlugin(m_engine);
+
+            if (timerPlugin == null)
+            {
+                MainConsole.Instance.Output("Plugin not yet initialized");
+                return;
+            }
+
+            List<Timer.TimerInfo> timersInfo = timerPlugin.GetTimersInfo();
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Part local ID", 13);
+            cdt.AddColumn("Script item ID", 36);
+            cdt.AddColumn("Interval", 10);
+            cdt.AddColumn("Next", 8);
+
+            foreach (Timer.TimerInfo t in timersInfo)
+            {
+                // Convert from 100 ns ticks back to seconds
+                cdt.AddRow(t.localID, t.itemID, (double)t.interval / 10000000, t.next);
+            }
+
+            MainConsole.Instance.Output(cdt.ToString());
+            MainConsole.Instance.OutputFormat("Total: {0}", timersInfo.Count);
+        }
     }
 }
\ No newline at end of file