diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 64ed6c7bc7..2a25b2b651 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -161,11 +161,6 @@ namespace OpenSim.Region.Framework.Scenes /// public float MinFrameTime { get; private set; } - /// - /// The time of the last frame update. - /// - protected DateTime m_lastFrameUpdate = DateTime.UtcNow; - private int m_update_physics = 1; private int m_update_entitymovement = 1; private int m_update_objects = 1; @@ -1238,8 +1233,7 @@ namespace OpenSim.Region.Framework.Scenes } public override void Update() - { - TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastFrameUpdate; + { float physicsFPS = 0f; int maintc = Util.EnvironmentTickCount(); @@ -1299,7 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes if (Frame % m_update_physics == 0) { if (m_physics_enabled) - physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)); + physicsFPS = m_sceneGraph.UpdatePhysics(MinFrameTime); + if (SynchronizeScene != null) SynchronizeScene(this); } @@ -1385,6 +1380,7 @@ namespace OpenSim.Region.Framework.Scenes { LoginsDisabled = false; } + m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface(), RegionInfo); } else @@ -1414,10 +1410,6 @@ namespace OpenSim.Region.Framework.Scenes { m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); } - finally - { - m_lastFrameUpdate = DateTime.UtcNow; - } maintc = Util.EnvironmentTickCountSubtract(maintc); maintc = (int)(MinFrameTime * 1000) - maintc;