aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-02-26 02:41:41 +0100
committerMelanie2012-02-26 02:41:41 +0100
commite9120890a2c02d1abae78cabb64e39542c14d3c0 (patch)
treeb0ffeb9c6ed4c4836cc7464551e8b90fa96961ec /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentImplement llSetKeyframedMotion. No persistence, no region crossing. Yet. (diff)
parent changed SOP Force and Torque, adding XML (de/)serialization, also changed Bu... (diff)
downloadopensim-SC-e9120890a2c02d1abae78cabb64e39542c14d3c0.zip
opensim-SC-e9120890a2c02d1abae78cabb64e39542c14d3c0.tar.gz
opensim-SC-e9120890a2c02d1abae78cabb64e39542c14d3c0.tar.bz2
opensim-SC-e9120890a2c02d1abae78cabb64e39542c14d3c0.tar.xz
Merge branch 'ubitwork'
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs23
1 files changed, 1 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5ccea13..9898681 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2057,30 +2057,9 @@ namespace OpenSim.Region.Framework.Scenes
2057 } 2057 }
2058 } 2058 }
2059 2059
2060 public void setAngularImpulse(Vector3 impulse)
2061 {
2062 if (RootPart.PhysActor != null)
2063 {
2064 if (!IsAttachment)
2065 {
2066 RootPart.PhysActor.Torque = impulse;
2067 m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor);
2068 }
2069 }
2070 }
2071
2072 public Vector3 GetTorque() 2060 public Vector3 GetTorque()
2073 { 2061 {
2074 if (RootPart.PhysActor != null) 2062 return RootPart.Torque;
2075 {
2076 if (!IsAttachment)
2077 {
2078 Vector3 torque = RootPart.PhysActor.Torque;
2079 return torque;
2080 }
2081 }
2082
2083 return Vector3.Zero;
2084 } 2063 }
2085 2064
2086 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object 2065 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object