Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
2026-08-04 16:22:50 +08:00 · 2012-03-07 00:51:59 +00:00
parent f3e04beb2e f3678d217f
commit caa19862fa
24 changed files with 452 additions and 106 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -37,6 +37,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
    {
        public AsyncCommandManager m_CmdManager;

+        public int TimersCount
+        {
+            get
+            {
+                lock (TimerListLock)
+                    return Timers.Count;
+            }
+        }
+
        public Timer(AsyncCommandManager CmdManager)
        {
            m_CmdManager = CmdManager;