diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs index 1c0ad20..8623891 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | |||
@@ -290,7 +290,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
290 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); | 290 | public abstract void AddPhysicsActorTaint(PhysicsActor prim); |
291 | 291 | ||
292 | 292 | ||
293 | public virtual void PrepareSimulation() { } | 293 | public virtual void ProcessPreSimulation() { } |
294 | 294 | ||
295 | /// <summary> | 295 | /// <summary> |
296 | /// Perform a simulation of the current physics scene over the given timestep. | 296 | /// Perform a simulation of the current physics scene over the given timestep. |
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 | |||
1526 | } | 1526 | } |
1527 | 1527 | ||
1528 | // does all pending changes generated during region load process | 1528 | // does all pending changes generated during region load process |
1529 | public override void PrepareSimulation() | 1529 | public override void ProcessPreSimulation() |
1530 | { | 1530 | { |
1531 | lock (OdeLock) | 1531 | lock (OdeLock) |
1532 | { | 1532 | { |
@@ -1541,7 +1541,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
1541 | int donechanges = 0; | 1541 | int donechanges = 0; |
1542 | if (ChangesQueue.Count > 0) | 1542 | if (ChangesQueue.Count > 0) |
1543 | { | 1543 | { |
1544 | m_log.InfoFormat("[ODE] start processing pending actor operations"); | 1544 | m_log.InfoFormat("[ubOde] start processing pending actor operations"); |
1545 | int tstart = Util.EnvironmentTickCount(); | 1545 | int tstart = Util.EnvironmentTickCount(); |
1546 | 1546 | ||
1547 | while (ChangesQueue.Dequeue(out item)) | 1547 | while (ChangesQueue.Dequeue(out item)) |
@@ -1564,8 +1564,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
1564 | donechanges++; | 1564 | donechanges++; |
1565 | } | 1565 | } |
1566 | int time = Util.EnvironmentTickCountSubtract(tstart); | 1566 | int time = Util.EnvironmentTickCountSubtract(tstart); |
1567 | m_log.InfoFormat("[ODE] finished {0} operations in {1}ms", donechanges, time); | 1567 | m_log.InfoFormat("[ubOde] finished {0} operations in {1}ms", donechanges, time); |
1568 | } | 1568 | } |
1569 | m_log.InfoFormat("[ubOde] {0} prim actors loaded",_prims.Count); | ||
1569 | } | 1570 | } |
1570 | } | 1571 | } |
1571 | 1572 | ||