OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge

avinationmerge
Melanie 2011-10-25 03:17:45 +01:00
parent e35835602f 6837e44d07
commit 3d0d84aff7
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -164,11 +164,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
public float MinFrameTime { get; private set; }
/// <summary>
/// The time of the last frame update.
/// </summary>
protected DateTime m_lastFrameUpdate = DateTime.UtcNow;
private int m_update_physics = 1;
private int m_update_entitymovement = 1;
private int m_update_objects = 1;
@ -1264,8 +1259,7 @@ namespace OpenSim.Region.Framework.Scenes
}
public override void Update()
{
TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastFrameUpdate;
{
float physicsFPS = 0f;
int maintc = Util.EnvironmentTickCount();
@ -1325,7 +1319,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);
}
@ -1418,6 +1413,7 @@ namespace OpenSim.Region.Framework.Scenes
{
LoginsDisabled = false;
}
m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
}
else
@ -1447,10 +1443,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;