diff options
author | UbitUmarov | 2015-12-16 23:13:10 +0000 |
---|---|---|
committer | UbitUmarov | 2015-12-16 23:13:10 +0000 |
commit | 764f270d34dcce91e5cbce4120aa8822220c96ee (patch) | |
tree | 5def060de442f419505aa9504f846f8a4b215922 | |
parent | temporary remove the delay on first child updates (diff) | |
download | opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.zip opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.gz opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.bz2 opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.xz |
revert last change and add delays on testing, since child updates now have time control, since they are heavy http connections
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs index 2409822..0af9504 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs | |||
@@ -41,6 +41,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | |||
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | using OpenSim.Tests.Common; | 43 | using OpenSim.Tests.Common; |
44 | using System.Threading; | ||
44 | 45 | ||
45 | namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests | 46 | namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests |
46 | { | 47 | { |
@@ -168,6 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests | |||
168 | sp1.AbsolutePosition = sp1Position; | 169 | sp1.AbsolutePosition = sp1Position; |
169 | sceneEast.Update(1); | 170 | sceneEast.Update(1); |
170 | 171 | ||
172 | Thread.Sleep(15000); // child updates are now time limited | ||
171 | // Check child position is correct. | 173 | // Check child position is correct. |
172 | Assert.AreEqual( | 174 | Assert.AreEqual( |
173 | new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), | 175 | new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), |
@@ -254,6 +256,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests | |||
254 | sp1Position = new Vector3(30, 128, 20); | 256 | sp1Position = new Vector3(30, 128, 20); |
255 | sp1.AbsolutePosition = sp1Position; | 257 | sp1.AbsolutePosition = sp1Position; |
256 | sceneNorth.Update(1); | 258 | sceneNorth.Update(1); |
259 | sceneSouth.Update(1); | ||
260 | |||
261 | Thread.Sleep(15000); // child updates are now time limited | ||
257 | 262 | ||
258 | // Check child position is correct. | 263 | // Check child position is correct. |
259 | Assert.AreEqual( | 264 | Assert.AreEqual( |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e27c02b..d870830 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2036,9 +2036,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2036 | m_agentTransfer.EnableChildAgents(this); | 2036 | m_agentTransfer.EnableChildAgents(this); |
2037 | } | 2037 | } |
2038 | // let updates be sent, with some delay | 2038 | // let updates be sent, with some delay |
2039 | // lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; | 2039 | lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; |
2040 | // temporary make them on next update | ||
2041 | lastChildUpdatesTime = Util.EnvironmentTickCount() - 50000; | ||
2042 | childUpdatesBusy = false; // allow them | 2040 | childUpdatesBusy = false; // allow them |
2043 | } | 2041 | } |
2044 | } | 2042 | } |