From 0ce9ad4a56ecfcb021208acb4e9650612bc7e931 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 1 Feb 2012 16:27:20 -0800
Subject: Add event RegionHeartbeatEnd for modules interested in coordinating
activity with region heartbeats
---
OpenSim/Region/Framework/Scenes/Scene.cs | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bfe8d2c..bbd2163 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1385,6 +1385,8 @@ namespace OpenSim.Region.Framework.Scenes
RegionInfo.RegionName, e.Message, e.StackTrace);
}
+ EventManager.TriggerRegionHeartbeatEnd(this);
+
maintc = Util.EnvironmentTickCountSubtract(maintc);
maintc = (int)(MinFrameTime * 1000) - maintc;
@@ -4290,16 +4292,16 @@ namespace OpenSim.Region.Framework.Scenes
public SceneObjectGroup GetGroupByPrim(uint localID)
{
return m_sceneGraph.GetGroupByPrim(localID);
- }
-
- ///
- /// Get a scene object group that contains the prim with the given uuid
- ///
- ///
- /// null if no scene object group containing that prim is found
- public SceneObjectGroup GetGroupByPrim(UUID fullID)
- {
- return m_sceneGraph.GetGroupByPrim(fullID);
+ }
+
+ ///
+ /// Get a scene object group that contains the prim with the given uuid
+ ///
+ ///
+ /// null if no scene object group containing that prim is found
+ public SceneObjectGroup GetGroupByPrim(UUID fullID)
+ {
+ return m_sceneGraph.GetGroupByPrim(fullID);
}
public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp)
--
cgit v1.1