aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2019-04-02 17:05:47 +0100
committerUbitUmarov2019-04-02 17:05:47 +0100
commite7f0131509c33e0af55d361f476f2c270aedb152 (patch)
treee012463ed217c931d52d90b761669ec1c7cf6825 /OpenSim/Region
parentmake tests happy again; try to speedup crossings (diff)
downloadopensim-SC-e7f0131509c33e0af55d361f476f2c270aedb152.zip
opensim-SC-e7f0131509c33e0af55d361f476f2c270aedb152.tar.gz
opensim-SC-e7f0131509c33e0af55d361f476f2c270aedb152.tar.bz2
opensim-SC-e7f0131509c33e0af55d361f476f2c270aedb152.tar.xz
another test....
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index abf8c48..7c3eab1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -155,11 +155,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
155 sp1SceneA.AbsolutePosition = so1StartPos; 155 sp1SceneA.AbsolutePosition = so1StartPos;
156 sp1SceneA.HandleAgentRequestSit(sp1SceneA.ControllingClient, sp1SceneA.UUID, so1.UUID, Vector3.Zero); 156 sp1SceneA.HandleAgentRequestSit(sp1SceneA.ControllingClient, sp1SceneA.UUID, so1.UUID, Vector3.Zero);
157 157
158 sceneA.Update(4);
159 sceneB.Update(4);
158 // Cross 160 // Cross
159 sceneA.SceneGraph.UpdatePrimGroupPosition( 161 sceneA.SceneGraph.UpdatePrimGroupPosition(
160 so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), sp1SceneA.ControllingClient); 162 so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), sp1SceneA.ControllingClient);
161 163
162 // crossing is async 164 // crossing is async
165 sceneA.Update(4);
166 sceneB.Update(4);
163 Thread.Sleep(500); 167 Thread.Sleep(500);
164 168
165 SceneObjectGroup so1PostCross; 169 SceneObjectGroup so1PostCross;
@@ -171,6 +175,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
171 TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient); 175 TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient);
172 sceneBTc.CompleteMovement(); 176 sceneBTc.CompleteMovement();
173 177
178 sceneA.Update(4);
179 sceneB.Update(4);
180
174 Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true"); 181 Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
175 Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject); 182 Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject);
176 183
@@ -188,6 +195,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
188 sceneB.SceneGraph.UpdatePrimGroupPosition( 195 sceneB.SceneGraph.UpdatePrimGroupPosition(
189 so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), sp1SceneBPostCross.ControllingClient); 196 so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), sp1SceneBPostCross.ControllingClient);
190 197
198 sceneA.Update(4);
199 sceneB.Update(4);
191 // crossing is async 200 // crossing is async
192 Thread.Sleep(500); 201 Thread.Sleep(500);
193 202