aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 2561fa5..9ad9318 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Physics.OdePlugin
147 } 147 }
148 CAPSULE_LENGTH = (size.Z - ((size.Z * height_fudge_factor))); 148 CAPSULE_LENGTH = (size.Z - ((size.Z * height_fudge_factor)));
149 149
150 lock (OdeScene.OdeLock) 150 lock (_parent_scene.OdeLock)
151 { 151 {
152 AvatarGeomAndBodyCreation(pos.X, pos.Y, pos.Z, m_tensor); 152 AvatarGeomAndBodyCreation(pos.X, pos.Y, pos.Z, m_tensor);
153 } 153 }
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Physics.OdePlugin
362 get { return _position; } 362 get { return _position; }
363 set 363 set
364 { 364 {
365 lock (OdeScene.OdeLock) 365 lock (_parent_scene.OdeLock)
366 { 366 {
367 d.BodySetPosition(Body, value.X, value.Y, value.Z); 367 d.BodySetPosition(Body, value.X, value.Y, value.Z);
368 _position = value; 368 _position = value;
@@ -386,7 +386,7 @@ namespace OpenSim.Region.Physics.OdePlugin
386 set 386 set
387 { 387 {
388 m_pidControllerActive = true; 388 m_pidControllerActive = true;
389 lock (OdeScene.OdeLock) 389 lock (_parent_scene.OdeLock)
390 { 390 {
391 d.JointDestroy(Amotor); 391 d.JointDestroy(Amotor);
392 392
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Physics.OdePlugin
863 /// </summary> 863 /// </summary>
864 public void Destroy() 864 public void Destroy()
865 { 865 {
866 lock (OdeScene.OdeLock) 866 lock (_parent_scene.OdeLock)
867 { 867 {
868 // Kill the Amotor 868 // Kill the Amotor
869 d.JointDestroy(Amotor); 869 d.JointDestroy(Amotor);