diff options
author | John Hurliman | 2009-10-25 23:16:12 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-26 18:23:43 -0700 |
commit | d199767e6991d6f368661fce9c5a072e564b8a4b (patch) | |
tree | d9347b8a424c0164e208f908613aa8fe1511444b /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | * Double the priority on avatar bake texture requests to get avatars rezzing ... (diff) | |
download | opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.zip opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.gz opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.bz2 opensim-SC-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.xz |
Experimental change of PhysicsVector to Vector3. Untested
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7eafef7..6c34056 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4606,7 +4606,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4606 | { | 4606 | { |
4607 | case PhysicsJointType.Ball: | 4607 | case PhysicsJointType.Ball: |
4608 | { | 4608 | { |
4609 | PhysicsVector jointAnchor = PhysicsScene.GetJointAnchor(joint); | 4609 | Vector3 jointAnchor = PhysicsScene.GetJointAnchor(joint); |
4610 | Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z); | 4610 | Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z); |
4611 | jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update | 4611 | jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update |
4612 | } | 4612 | } |
@@ -4614,7 +4614,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4614 | 4614 | ||
4615 | case PhysicsJointType.Hinge: | 4615 | case PhysicsJointType.Hinge: |
4616 | { | 4616 | { |
4617 | PhysicsVector jointAnchor = PhysicsScene.GetJointAnchor(joint); | 4617 | Vector3 jointAnchor = PhysicsScene.GetJointAnchor(joint); |
4618 | 4618 | ||
4619 | // Normally, we would just ask the physics scene to return the axis for the joint. | 4619 | // Normally, we would just ask the physics scene to return the axis for the joint. |
4620 | // Unfortunately, ODE sometimes returns <0,0,0> for the joint axis, which should | 4620 | // Unfortunately, ODE sometimes returns <0,0,0> for the joint axis, which should |