diff options
| author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
| commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
| tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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)) |