diff options
author | KittoFlora | 2009-11-02 21:53:51 +0100 |
---|---|---|
committer | KittoFlora | 2009-11-02 21:53:51 +0100 |
commit | 2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch) | |
tree | e44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Removing Console.WriteLine()s that were brought in with the revert (diff) | |
download | opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2 opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | 2 |
1 files changed, 0 insertions, 2 deletions
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)) |