diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs index ec58a5a..c2c7822 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | |||
| @@ -137,7 +137,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 137 | Vector3 childPosition = new Vector3(rootPartPosition + rotatedChildOffsetPosition); | 137 | Vector3 childPosition = new Vector3(rootPartPosition + rotatedChildOffsetPosition); |
| 138 | 138 | ||
| 139 | SceneObjectPart childPart = so.Parts[1]; | 139 | SceneObjectPart childPart = so.Parts[1]; |
| 140 | 140 | ||
| 141 | Assert.That(childPart.AbsolutePosition, Is.EqualTo(childPosition)); | 141 | Assert.That(childPart.AbsolutePosition, Is.EqualTo(childPosition)); |
| 142 | 142 | ||
| 143 | Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition)); | 143 | Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition)); |