diff options
author | UbitUmarov | 2012-02-25 22:20:25 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-25 22:20:25 +0000 |
commit | e07440d0c53fdc8e90f4887242e3b21049a729c0 (patch) | |
tree | cba4154ec1678c27aa9b4adf1c9a80088554dac1 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC_OLD-e07440d0c53fdc8e90f4887242e3b21049a729c0.zip opensim-SC_OLD-e07440d0c53fdc8e90f4887242e3b21049a729c0.tar.gz opensim-SC_OLD-e07440d0c53fdc8e90f4887242e3b21049a729c0.tar.bz2 opensim-SC_OLD-e07440d0c53fdc8e90f4887242e3b21049a729c0.tar.xz |
changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 248d4c6..e9021f1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2045,30 +2045,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2045 | } | 2045 | } |
2046 | } | 2046 | } |
2047 | 2047 | ||
2048 | public void setAngularImpulse(Vector3 impulse) | ||
2049 | { | ||
2050 | if (RootPart.PhysActor != null) | ||
2051 | { | ||
2052 | if (!IsAttachment) | ||
2053 | { | ||
2054 | RootPart.PhysActor.Torque = impulse; | ||
2055 | m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor); | ||
2056 | } | ||
2057 | } | ||
2058 | } | ||
2059 | |||
2060 | public Vector3 GetTorque() | 2048 | public Vector3 GetTorque() |
2061 | { | 2049 | { |
2062 | if (RootPart.PhysActor != null) | 2050 | return RootPart.Torque; |
2063 | { | ||
2064 | if (!IsAttachment) | ||
2065 | { | ||
2066 | Vector3 torque = RootPart.PhysActor.Torque; | ||
2067 | return torque; | ||
2068 | } | ||
2069 | } | ||
2070 | |||
2071 | return Vector3.Zero; | ||
2072 | } | 2051 | } |
2073 | 2052 | ||
2074 | // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object | 2053 | // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object |