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

In SceneGraph, use the property PhysicsScene instead of the variable _PhysScene, so that it gets properly initialized before being dereferenced.

0.8.2-post-fixes
Diva Canto 2015-09-04 10:54:04 -07:00
parent 9d7e310e21
commit 218eb908be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -162,9 +162,9 @@ namespace OpenSim.Region.Framework.Scenes
// PhysX does this (runs in the background). // PhysX does this (runs in the background).
if (_PhyScene.IsThreaded) if (PhysicsScene.IsThreaded)
{ {
_PhyScene.GetResults(); PhysicsScene.GetResults();
} }
} }
@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
// position). // position).
// //
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return _PhyScene.Simulate((float)elapsed); return PhysicsScene.Simulate((float)elapsed);
} }
protected internal void UpdateScenePresenceMovement() protected internal void UpdateScenePresenceMovement()