diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 28 |
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 | |||
67 | protected int m_numChildAgents = 0; | 67 | protected int m_numChildAgents = 0; |
68 | protected int m_physicalPrim = 0; | 68 | protected int m_physicalPrim = 0; |
69 | 69 | ||
70 | protected int m_activeScripts = 0; | ||
71 | protected int m_scriptLPS = 0; | ||
72 | |||
70 | internal object m_syncRoot = new object(); | 73 | internal object m_syncRoot = new object(); |
71 | 74 | ||
72 | public PhysicsScene _PhyScene; | 75 | public PhysicsScene _PhyScene; |
@@ -201,6 +204,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
201 | m_physicalPrim--; | 204 | m_physicalPrim--; |
202 | } | 205 | } |
203 | 206 | ||
207 | public void AddToScriptLPS(int number) | ||
208 | { | ||
209 | m_scriptLPS += number; | ||
210 | } | ||
211 | |||
212 | public void AddActiveScripts(int number) | ||
213 | { | ||
214 | m_activeScripts += number; | ||
215 | } | ||
216 | |||
204 | public void RemovePrim(uint localID, LLUUID avatar_deleter) | 217 | public void RemovePrim(uint localID, LLUUID avatar_deleter) |
205 | { | 218 | { |
206 | List<EntityBase> EntityList = GetEntities(); | 219 | List<EntityBase> EntityList = GetEntities(); |
@@ -322,6 +335,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
322 | return m_physicalPrim; | 335 | return m_physicalPrim; |
323 | } | 336 | } |
324 | 337 | ||
338 | public int GetActiveScripts() | ||
339 | { | ||
340 | return m_activeScripts; | ||
341 | } | ||
342 | |||
343 | public int GetScriptLPS() | ||
344 | { | ||
345 | int returnval = m_scriptLPS; | ||
346 | m_scriptLPS = 0; | ||
347 | return returnval; | ||
348 | } | ||
325 | #endregion | 349 | #endregion |
326 | 350 | ||
327 | #region Get Methods | 351 | #region Get Methods |
@@ -546,10 +570,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
546 | 570 | ||
547 | //m_log.Info("[DISTANCE]: " + distResult.ToString()); | 571 | //m_log.Info("[DISTANCE]: " + distResult.ToString()); |
548 | 572 | ||
549 | if (distResult > 60) | ||
550 | { | ||
551 | int x = 0; | ||
552 | } | ||
553 | if (distResult < presence.DrawDistance) | 573 | if (distResult < presence.DrawDistance) |
554 | { | 574 | { |
555 | // Send Only if we don't already know about it. | 575 | // Send Only if we don't already know about it. |