* Added Active Scripts to report the number of scripts running to Sim Stats

* Added Script Performance to report the number of functions run per second to Sim Stats.
* Removed a few warnings (@.@ up to 50 now)

1 files changed, 24 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 49aeaf9..8a7402c 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -67,6 +67,9 @@ namespace OpenSim.Region.Environment.Scenes
         protected int m_numChildAgents = 0;
         protected int m_physicalPrim = 0;
 
+        protected int m_activeScripts = 0;
+        protected int m_scriptLPS = 0;
+
         internal object m_syncRoot = new object();
 
         public PhysicsScene _PhyScene;
@@ -201,6 +204,16 @@ namespace OpenSim.Region.Environment.Scenes
             m_physicalPrim--;
         }
 
+        public void AddToScriptLPS(int number)
+        {
+            m_scriptLPS += number;
+        }
+
+        public void AddActiveScripts(int number)
+        {
+            m_activeScripts += number;
+        }
+
         public void RemovePrim(uint localID, LLUUID avatar_deleter)
         {
             List<EntityBase> EntityList = GetEntities();
@@ -322,6 +335,17 @@ namespace OpenSim.Region.Environment.Scenes
             return m_physicalPrim;
         }
 
+        public int GetActiveScripts()
+        {
+            return m_activeScripts;
+        }
+
+        public int GetScriptLPS()
+        {
+            int returnval = m_scriptLPS;
+            m_scriptLPS = 0;
+            return returnval;
+        }
         #endregion
 
         #region Get Methods
@@ -546,10 +570,6 @@ namespace OpenSim.Region.Environment.Scenes
 
                         //m_log.Info("[DISTANCE]: " + distResult.ToString());
 
-                        if (distResult > 60)
-                        {
-                            int x = 0;
-                        }
                         if (distResult < presence.DrawDistance)
                         {
                             // Send Only if we don't already know about it.