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

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;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
+using System.Threading;
 
 namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 {
@@ -168,6 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             sp1.AbsolutePosition = sp1Position;
             sceneEast.Update(1);
 
+            Thread.Sleep(15000); // child updates are now time limited
             // Check child position is correct.
             Assert.AreEqual(
                 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);
             sp1.AbsolutePosition = sp1Position;
             sceneNorth.Update(1);
+            sceneSouth.Update(1);
+
+            Thread.Sleep(15000); // child updates are now time limited
 
             // Check child position is correct.
             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
                             m_agentTransfer.EnableChildAgents(this);
                         }
                         // let updates be sent,  with some delay
-//                        lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000;
-                        // temporary make them on next update
-                        lastChildUpdatesTime = Util.EnvironmentTickCount() - 50000;
+                        lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000;
                         childUpdatesBusy = false; // allow them
                     }
                 }