aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 05:25:34 +0100
committerUbitUmarov2012-07-17 05:25:34 +0100
commit1ff498266cd5ecc4ed8f3b1de86758b78a327f61 (patch)
tree6fb15419dc372968ad1fd1d94bc52ff6235eda27 /OpenSim
parent fix our stats ( old schema ) (diff)
downloadopensim-SC_OLD-1ff498266cd5ecc4ed8f3b1de86758b78a327f61.zip
opensim-SC_OLD-1ff498266cd5ecc4ed8f3b1de86758b78a327f61.tar.gz
opensim-SC_OLD-1ff498266cd5ecc4ed8f3b1de86758b78a327f61.tar.bz2
opensim-SC_OLD-1ff498266cd5ecc4ed8f3b1de86758b78a327f61.tar.xz
minor changes, removed extra parts physics updates on linking nonroot
prims
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f1f94a7..6ab0027 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3066,7 +3066,7 @@ namespace OpenSim.Region.Framework.Scenes
3066 part.LinkNum = linkNum; 3066 part.LinkNum = linkNum;
3067 3067
3068 // Compute the new position of this SOP relative to the group position 3068 // Compute the new position of this SOP relative to the group position
3069 part.OffsetPosition = part.GroupPosition - AbsolutePosition; 3069 part.OffsetPosition = newPos - AbsolutePosition;
3070 3070
3071 // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times. 3071 // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times.
3072 // It would have the affect of setting the physics engine position multiple 3072 // It would have the affect of setting the physics engine position multiple
@@ -3087,7 +3087,8 @@ namespace OpenSim.Region.Framework.Scenes
3087 3087
3088 // Since this SOP's state has changed, push those changes into the physics engine 3088 // Since this SOP's state has changed, push those changes into the physics engine
3089 // and the simulator. 3089 // and the simulator.
3090 part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false); 3090 // done on caller
3091// part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
3091 } 3092 }
3092 3093
3093 /// <summary> 3094 /// <summary>