aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-02-19 14:57:51 +0000
committerMelanie2012-02-19 14:57:51 +0000
commit488ec594088ec49142b11a645f90a1030ea5f627 (patch)
treeb7a54a2d734d3b85f10985bca7a707a6c2c4f057 /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentFix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.... (diff)
downloadopensim-SC_OLD-488ec594088ec49142b11a645f90a1030ea5f627.zip
opensim-SC_OLD-488ec594088ec49142b11a645f90a1030ea5f627.tar.gz
opensim-SC_OLD-488ec594088ec49142b11a645f90a1030ea5f627.tar.bz2
opensim-SC_OLD-488ec594088ec49142b11a645f90a1030ea5f627.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 6cde89c..4a08ce3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1604,9 +1604,9 @@ namespace OpenSim.Region.Framework.Scenes
1604 dupe.GroupPosition = GroupPosition; 1604 dupe.GroupPosition = GroupPosition;
1605 dupe.OffsetPosition = OffsetPosition; 1605 dupe.OffsetPosition = OffsetPosition;
1606 dupe.RotationOffset = RotationOffset; 1606 dupe.RotationOffset = RotationOffset;
1607 dupe.Velocity = new Vector3(0, 0, 0); 1607 dupe.Velocity = Velocity;
1608 dupe.Acceleration = new Vector3(0, 0, 0); 1608 dupe.Acceleration = Acceleration;
1609 dupe.AngularVelocity = new Vector3(0, 0, 0); 1609 dupe.AngularVelocity = AngularVelocity;
1610 dupe.Flags = Flags; 1610 dupe.Flags = Flags;
1611 1611
1612 dupe.OwnershipCost = OwnershipCost; 1612 dupe.OwnershipCost = OwnershipCost;