revert last change and add delays on testing, since child updates now have time control, since they are heavy http connections

LSLKeyTest
UbitUmarov 2015-12-16 23:13:10 +00:00
parent ddd067266b
commit 764f270d34
2 changed files with 6 additions and 3 deletions

View File

@ -41,6 +41,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
using System.Threading;
namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
{ {
@ -168,6 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
sp1.AbsolutePosition = sp1Position; sp1.AbsolutePosition = sp1Position;
sceneEast.Update(1); sceneEast.Update(1);
Thread.Sleep(15000); // child updates are now time limited
// Check child position is correct. // Check child position is correct.
Assert.AreEqual( Assert.AreEqual(
new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
@ -254,6 +256,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
sp1Position = new Vector3(30, 128, 20); sp1Position = new Vector3(30, 128, 20);
sp1.AbsolutePosition = sp1Position; sp1.AbsolutePosition = sp1Position;
sceneNorth.Update(1); sceneNorth.Update(1);
sceneSouth.Update(1);
Thread.Sleep(15000); // child updates are now time limited
// Check child position is correct. // Check child position is correct.
Assert.AreEqual( Assert.AreEqual(

View File

@ -2036,9 +2036,7 @@ namespace OpenSim.Region.Framework.Scenes
m_agentTransfer.EnableChildAgents(this); m_agentTransfer.EnableChildAgents(this);
} }
// let updates be sent, with some delay // let updates be sent, with some delay
// lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000;
// temporary make them on next update
lastChildUpdatesTime = Util.EnvironmentTickCount() - 50000;
childUpdatesBusy = false; // allow them childUpdatesBusy = false; // allow them
} }
} }