diff options
| author | KittoFlora | 2009-11-16 01:40:15 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-16 01:40:15 +0100 |
| commit | 873c9098d8627972e80a1688e85a4cda45e1e7fe (patch) | |
| tree | a0edc24aef11d5ad6928493d8985386f48dd2607 /OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |
| parent | Merge branch 'vehicles' into tests (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to '')
| -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)) |