diff options
| author | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
| commit | a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec (patch) | |
| tree | f26aa58d3a31ea6460a9cb76cc70a2ccb34945cc /OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |
| parent | Change default say distance to 20m from 30m, the same as on the big grid. Th... (diff) | |
| parent | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size (diff) | |
| download | opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.zip opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.gz opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.bz2 opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 90cdd7b..a2332bb 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
| @@ -70,8 +70,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 70 | grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0)); | 70 | grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0)); |
| 71 | 71 | ||
| 72 | // Required for linking | 72 | // Required for linking |
| 73 | grp1.RootPart.UpdateFlag = 0; | 73 | grp1.RootPart.ClearUpdateSchedule(); |
| 74 | grp2.RootPart.UpdateFlag = 0; | 74 | grp2.RootPart.ClearUpdateSchedule(); |
| 75 | 75 | ||
| 76 | // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated. | 76 | // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated. |
| 77 | grp1.LinkToGroup(grp2); | 77 | grp1.LinkToGroup(grp2); |
| @@ -164,10 +164,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 164 | grp4.UpdateGroupRotationR(Quaternion.CreateFromEulers(0, 90 * Utils.DEG_TO_RAD, 0)); | 164 | grp4.UpdateGroupRotationR(Quaternion.CreateFromEulers(0, 90 * Utils.DEG_TO_RAD, 0)); |
| 165 | 165 | ||
| 166 | // Required for linking | 166 | // Required for linking |
| 167 | grp1.RootPart.UpdateFlag = 0; | 167 | grp1.RootPart.ClearUpdateSchedule(); |
| 168 | grp2.RootPart.UpdateFlag = 0; | 168 | grp2.RootPart.ClearUpdateSchedule(); |
| 169 | grp3.RootPart.UpdateFlag = 0; | 169 | grp3.RootPart.ClearUpdateSchedule(); |
| 170 | grp4.RootPart.UpdateFlag = 0; | 170 | grp4.RootPart.ClearUpdateSchedule(); |
| 171 | 171 | ||
| 172 | // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated. | 172 | // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated. |
| 173 | grp1.LinkToGroup(grp2); | 173 | grp1.LinkToGroup(grp2); |
| @@ -198,8 +198,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | // Required for linking | 200 | // Required for linking |
| 201 | grp1.RootPart.UpdateFlag = 0; | 201 | grp1.RootPart.ClearUpdateSchedule(); |
| 202 | grp3.RootPart.UpdateFlag = 0; | 202 | grp3.RootPart.ClearUpdateSchedule(); |
| 203 | 203 | ||
| 204 | // root part should have no offset position or rotation | 204 | // root part should have no offset position or rotation |
| 205 | Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, | 205 | Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, |