Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

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
             grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
             
             // Required for linking
-            grp1.RootPart.UpdateFlag = 0;
-            grp2.RootPart.UpdateFlag = 0;
+            grp1.RootPart.ClearUpdateSchedule();
+            grp2.RootPart.ClearUpdateSchedule();
 
             // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
             grp1.LinkToGroup(grp2);
@@ -164,10 +164,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp4.UpdateGroupRotationR(Quaternion.CreateFromEulers(0, 90 * Utils.DEG_TO_RAD, 0));
 
             // Required for linking
-            grp1.RootPart.UpdateFlag = 0;
-            grp2.RootPart.UpdateFlag = 0;
-            grp3.RootPart.UpdateFlag = 0;
-            grp4.RootPart.UpdateFlag = 0;
+            grp1.RootPart.ClearUpdateSchedule();
+            grp2.RootPart.ClearUpdateSchedule();
+            grp3.RootPart.ClearUpdateSchedule();
+            grp4.RootPart.ClearUpdateSchedule();
 
             // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
             grp1.LinkToGroup(grp2);
@@ -198,8 +198,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             // Required for linking
-            grp1.RootPart.UpdateFlag = 0;
-            grp3.RootPart.UpdateFlag = 0;
+            grp1.RootPart.ClearUpdateSchedule();
+            grp3.RootPart.ClearUpdateSchedule();
 
             // root part should have no offset position or rotation
             Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity,