aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
diff options
context:
space:
mode:
authorMelanie2012-03-07 00:51:59 +0000
committerMelanie2012-03-07 00:51:59 +0000
commitcaa19862fa9a26bc5ee53e220565f99fc4084f33 (patch)
tree6b7629a4156c9c9865c08c45108c46b805fa6239 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentStop individually deleting objects at the end of each ObjectTortureTest. (diff)
downloadopensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.zip
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.gz
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.bz2
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 2fd33fe..9ee6946 100644
--- 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
37 { 37 {
38 public AsyncCommandManager m_CmdManager; 38 public AsyncCommandManager m_CmdManager;
39 39
40 public int TimersCount
41 {
42 get
43 {
44 lock (TimerListLock)
45 return Timers.Count;
46 }
47 }
48
40 public Timer(AsyncCommandManager CmdManager) 49 public Timer(AsyncCommandManager CmdManager)
41 { 50 {
42 m_CmdManager = CmdManager; 51 m_CmdManager = CmdManager;