From 7cb6ecb9f54415fd723d7b7c85a65eb131aab077 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 22 Oct 2015 17:34:28 +0100 Subject: Make physics engines finish internal representation of loaded prims before starting simulation so it does start for all at same time. Currently only in use by ubOde --- OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/ubOde') diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 103304d..2da2603 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -1526,7 +1526,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde } // does all pending changes generated during region load process - public override void PrepareSimulation() + public override void ProcessPreSimulation() { lock (OdeLock) { @@ -1541,7 +1541,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde int donechanges = 0; if (ChangesQueue.Count > 0) { - m_log.InfoFormat("[ODE] start processing pending actor operations"); + m_log.InfoFormat("[ubOde] start processing pending actor operations"); int tstart = Util.EnvironmentTickCount(); while (ChangesQueue.Dequeue(out item)) @@ -1564,8 +1564,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde donechanges++; } int time = Util.EnvironmentTickCountSubtract(tstart); - m_log.InfoFormat("[ODE] finished {0} operations in {1}ms", donechanges, time); + m_log.InfoFormat("[ubOde] finished {0} operations in {1}ms", donechanges, time); } + m_log.InfoFormat("[ubOde] {0} prim actors loaded",_prims.Count); } } -- cgit v1.1