diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 22 |
1 files changed, 12 insertions, 10 deletions
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 | |||
1385 | RegionInfo.RegionName, e.Message, e.StackTrace); | 1385 | RegionInfo.RegionName, e.Message, e.StackTrace); |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | EventManager.TriggerRegionHeartbeatEnd(this); | ||
1389 | |||
1388 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1390 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
1389 | maintc = (int)(MinFrameTime * 1000) - maintc; | 1391 | maintc = (int)(MinFrameTime * 1000) - maintc; |
1390 | 1392 | ||
@@ -4290,16 +4292,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
4290 | public SceneObjectGroup GetGroupByPrim(uint localID) | 4292 | public SceneObjectGroup GetGroupByPrim(uint localID) |
4291 | { | 4293 | { |
4292 | return m_sceneGraph.GetGroupByPrim(localID); | 4294 | return m_sceneGraph.GetGroupByPrim(localID); |
4293 | } | 4295 | } |
4294 | 4296 | ||
4295 | /// <summary> | 4297 | /// <summary> |
4296 | /// Get a scene object group that contains the prim with the given uuid | 4298 | /// Get a scene object group that contains the prim with the given uuid |
4297 | /// </summary> | 4299 | /// </summary> |
4298 | /// <param name="fullID"></param> | 4300 | /// <param name="fullID"></param> |
4299 | /// <returns>null if no scene object group containing that prim is found</returns> | 4301 | /// <returns>null if no scene object group containing that prim is found</returns> |
4300 | public SceneObjectGroup GetGroupByPrim(UUID fullID) | 4302 | public SceneObjectGroup GetGroupByPrim(UUID fullID) |
4301 | { | 4303 | { |
4302 | return m_sceneGraph.GetGroupByPrim(fullID); | 4304 | return m_sceneGraph.GetGroupByPrim(fullID); |
4303 | } | 4305 | } |
4304 | 4306 | ||
4305 | public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp) | 4307 | public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp) |