aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs18
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0ac5be0..87fac0c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -434,7 +434,7 @@ namespace OpenSim.Region.Framework.Scenes
434 { 434 {
435 lock (m_scene.SyncRoot) 435 lock (m_scene.SyncRoot)
436 { 436 {
437 m_physicsActor.Position = new PhysicsVector(value.X, value.Y, value.Z); 437 m_physicsActor.Position = value;
438 } 438 }
439 } 439 }
440 catch (Exception e) 440 catch (Exception e)
@@ -474,7 +474,7 @@ namespace OpenSim.Region.Framework.Scenes
474 { 474 {
475 lock (m_scene.SyncRoot) 475 lock (m_scene.SyncRoot)
476 { 476 {
477 m_physicsActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z); 477 m_physicsActor.Velocity = value;
478 } 478 }
479 } 479 }
480 catch (Exception e) 480 catch (Exception e)
@@ -1046,7 +1046,7 @@ namespace OpenSim.Region.Framework.Scenes
1046 m_avHeight = height; 1046 m_avHeight = height;
1047 if (PhysicsActor != null && !IsChildAgent) 1047 if (PhysicsActor != null && !IsChildAgent)
1048 { 1048 {
1049 PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight); 1049 Vector3 SetSize = new Vector3(0.45f, 0.6f, m_avHeight);
1050 PhysicsActor.Size = SetSize; 1050 PhysicsActor.Size = SetSize;
1051 } 1051 }
1052 } 1052 }
@@ -3345,20 +3345,18 @@ namespace OpenSim.Region.Framework.Scenes
3345 3345
3346 PhysicsScene scene = m_scene.PhysicsScene; 3346 PhysicsScene scene = m_scene.PhysicsScene;
3347 3347
3348 PhysicsVector pVec = 3348 Vector3 pVec = AbsolutePosition;
3349 new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
3350 AbsolutePosition.Z);
3351 3349
3352 // Old bug where the height was in centimeters instead of meters 3350 // Old bug where the height was in centimeters instead of meters
3353 if (m_avHeight == 127.0f) 3351 if (m_avHeight == 127.0f)
3354 { 3352 {
3355 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, new PhysicsVector(0, 0, 1.56f), 3353 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, new Vector3(0f, 0f, 1.56f),
3356 isFlying); 3354 isFlying);
3357 } 3355 }
3358 else 3356 else
3359 { 3357 {
3360 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, 3358 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec,
3361 new PhysicsVector(0, 0, m_avHeight), isFlying); 3359 new Vector3(0f, 0f, m_avHeight), isFlying);
3362 } 3360 }
3363 scene.AddPhysicsActorTaint(m_physicsActor); 3361 scene.AddPhysicsActorTaint(m_physicsActor);
3364 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3362 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
@@ -3369,7 +3367,7 @@ namespace OpenSim.Region.Framework.Scenes
3369 3367
3370 } 3368 }
3371 3369
3372 private void OutOfBoundsCall(PhysicsVector pos) 3370 private void OutOfBoundsCall(Vector3 pos)
3373 { 3371 {
3374 //bool flying = m_physicsActor.Flying; 3372 //bool flying = m_physicsActor.Flying;
3375 //RemoveFromPhysicalScene(); 3373 //RemoveFromPhysicalScene();
@@ -3592,7 +3590,7 @@ namespace OpenSim.Region.Framework.Scenes
3592 */ 3590 */
3593 } 3591 }
3594 3592
3595 internal void PushForce(PhysicsVector impulse) 3593 internal void PushForce(Vector3 impulse)
3596 { 3594 {
3597 if (PhysicsActor != null) 3595 if (PhysicsActor != null)
3598 { 3596 {