diff options
| author | Melanie | 2009-10-27 11:32:11 +0000 |
|---|---|---|
| committer | Melanie | 2009-10-27 11:32:11 +0000 |
| commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
| tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Region/Physics/Manager/PhysicsJoint.cs | |
| parent | Commented out instrumentation in ODEPrim.cs (diff) | |
| parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
| download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsJoint.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsJoint.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs b/OpenSim/Region/Physics/Manager/PhysicsJoint.cs index f463597..b685d04 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsJoint.cs | |||
| @@ -44,7 +44,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 44 | public PhysicsJointType Type; | 44 | public PhysicsJointType Type; |
| 45 | public string RawParams; | 45 | public string RawParams; |
| 46 | public List<string> BodyNames = new List<string>(); | 46 | public List<string> BodyNames = new List<string>(); |
| 47 | public PhysicsVector Position; // global coords | 47 | public Vector3 Position; // global coords |
| 48 | public Quaternion Rotation; // global coords | 48 | public Quaternion Rotation; // global coords |
| 49 | public string ObjectNameInScene; // proxy object in scene that represents the joint position/orientation | 49 | public string ObjectNameInScene; // proxy object in scene that represents the joint position/orientation |
| 50 | public string TrackedBodyName; // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName) | 50 | public string TrackedBodyName; // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName) |