diff options
author | John Hurliman | 2009-11-02 11:28:35 -0800 |
---|---|---|
committer | John Hurliman | 2009-11-02 11:28:35 -0800 |
commit | 67ac9881faf2034facfe92613538938695c2cda9 (patch) | |
tree | ac2fcdfe3c9c99120ba2c9901d5175e1389fa622 /OpenSim/Region/OptionalModules/ContentManagementSystem | |
parent | Reverting the memory leak patch for MySQL. Problems have been reported with t... (diff) | |
download | opensim-SC_OLD-67ac9881faf2034facfe92613538938695c2cda9.zip opensim-SC_OLD-67ac9881faf2034facfe92613538938695c2cda9.tar.gz opensim-SC_OLD-67ac9881faf2034facfe92613538938695c2cda9.tar.bz2 opensim-SC_OLD-67ac9881faf2034facfe92613538938695c2cda9.tar.xz |
Removing duplicate SceneObjectPart.RotationalVelocity property
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs index fbe43d6..2c5093f 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | |||
@@ -81,12 +81,11 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
81 | y.Scale = new Vector3(0.01f,0.01f,0.01f); | 81 | y.Scale = new Vector3(0.01f,0.01f,0.01f); |
82 | y.LastOwnerID = UUID.Zero; | 82 | y.LastOwnerID = UUID.Zero; |
83 | y.GroupPosition = groupPos; | 83 | y.GroupPosition = groupPos; |
84 | y.OffsetPosition = new Vector3(0, 0, 0); | 84 | y.OffsetPosition = Vector3.Zero; |
85 | y.RotationOffset = new Quaternion(0,0,0,0); | 85 | y.RotationOffset = Quaternion.Identity; |
86 | y.Velocity = new Vector3(0, 0, 0); | 86 | y.Velocity = Vector3.Zero; |
87 | y.RotationalVelocity = new Vector3(0, 0, 0); | 87 | y.AngularVelocity = Vector3.Zero; |
88 | y.AngularVelocity = new Vector3(0, 0, 0); | 88 | y.Acceleration = Vector3.Zero; |
89 | y.Acceleration = new Vector3(0, 0, 0); | ||
90 | 89 | ||
91 | y.Flags = 0; | 90 | y.Flags = 0; |
92 | y.TrimPermissions(); | 91 | y.TrimPermissions(); |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs index e185351..a6afa5a 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
@@ -172,8 +172,6 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
172 | result |= Diff.ANGULARVELOCITY; | 172 | result |= Diff.ANGULARVELOCITY; |
173 | if (!AreVectorsEquivalent(first.OffsetPosition, second.OffsetPosition)) | 173 | if (!AreVectorsEquivalent(first.OffsetPosition, second.OffsetPosition)) |
174 | result |= Diff.OFFSETPOSITION; | 174 | result |= Diff.OFFSETPOSITION; |
175 | if (!AreVectorsEquivalent(first.RotationalVelocity, second.RotationalVelocity)) | ||
176 | result |= Diff.ROTATIONALVELOCITY; | ||
177 | if (!AreVectorsEquivalent(first.Scale, second.Scale)) | 175 | if (!AreVectorsEquivalent(first.Scale, second.Scale)) |
178 | result |= Diff.SCALE; | 176 | result |= Diff.SCALE; |
179 | if (!AreVectorsEquivalent(first.Velocity, second.Velocity)) | 177 | if (!AreVectorsEquivalent(first.Velocity, second.Velocity)) |