aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-02-27 08:50:19 +0100
committerMelanie2012-02-27 08:50:19 +0100
commitaee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65 (patch)
treea43d9c79e376976d172fd2587ce89e9d8a8e9174 /OpenSim
parentFix NPC appearance setting to include attachments again (diff)
downloadopensim-SC-aee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65.zip
opensim-SC-aee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65.tar.gz
opensim-SC-aee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65.tar.bz2
opensim-SC-aee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65.tar.xz
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ea3d716..1c72b10 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -916,7 +916,7 @@ namespace OpenSim.Region.Framework.Scenes
916 get 916 get
917 { 917 {
918 PhysicsActor actor = PhysActor; 918 PhysicsActor actor = PhysActor;
919 if ((actor != null) && actor.IsPhysical) 919 if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this)
920 { 920 {
921 m_angularVelocity = actor.RotationalVelocity; 921 m_angularVelocity = actor.RotationalVelocity;
922 } 922 }
@@ -1893,7 +1893,8 @@ namespace OpenSim.Region.Framework.Scenes
1893 1893
1894 Velocity = new Vector3(0, 0, 0); 1894 Velocity = new Vector3(0, 0, 0);
1895 Acceleration = new Vector3(0, 0, 0); 1895 Acceleration = new Vector3(0, 0, 0);
1896 AngularVelocity = new Vector3(0, 0, 0); 1896 if (ParentGroup.RootPart == this)
1897 AngularVelocity = new Vector3(0, 0, 0);
1897 1898
1898 PhysActor.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate; 1899 PhysActor.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
1899 PhysActor.OnOutOfBounds -= PhysicsOutOfBounds; 1900 PhysActor.OnOutOfBounds -= PhysicsOutOfBounds;
@@ -1917,7 +1918,8 @@ namespace OpenSim.Region.Framework.Scenes
1917 // velocity-vector. 1918 // velocity-vector.
1918 Velocity = new Vector3(0, 0, 0); 1919 Velocity = new Vector3(0, 0, 0);
1919 Acceleration = new Vector3(0, 0, 0); 1920 Acceleration = new Vector3(0, 0, 0);
1920 AngularVelocity = new Vector3(0, 0, 0); 1921 if (ParentGroup.RootPart == this)
1922 AngularVelocity = new Vector3(0, 0, 0);
1921 //RotationalVelocity = new Vector3(0, 0, 0); 1923 //RotationalVelocity = new Vector3(0, 0, 0);
1922 } 1924 }
1923 1925