2 files changed, 236 insertions, 124 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f0b1e67..ea90185 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -45,17 +45,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private const int DEBUG_CHANNEL = 2147483647;
-
-        private bool m_enabled = true;
-        private int m_saydistance = 20;
-        private int m_shoutdistance = 100;
-        private int m_whisperdistance = 10;
-
-        internal object m_syncy = new object();
-
-        internal IConfig m_config;
-
+        protected const int DEBUG_CHANNEL = 2147483647;
+
+        protected bool m_enabled = true;
+        protected int m_saydistance = 20;
+        protected int m_shoutdistance = 100;
+        protected int m_whisperdistance = 10;
+        protected List<Scene> m_scenes = new List<Scene>();
+        protected List<string> FreezeCache = new List<string>();
+        protected string m_adminPrefix = "";
+        protected object m_syncy = new object();
+        protected IConfig m_config;
         #region ISharedRegionModule Members
         public virtual void Initialise(IConfigSource config)
         {
@@ -69,21 +69,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     m_enabled = false;
                     return;
                 }
-            }
 
-            m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
-            m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
-            m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
+            m_whisperdistance = m_config.GetInt("whisper_distance", m_whisperdistance);
+            m_saydistance = m_config.GetInt("say_distance", m_saydistance);
+            m_shoutdistance = m_config.GetInt("shout_distance", m_shoutdistance);
+            m_adminPrefix = m_config.GetString("admin_prefix", "");
+            }
         }
 
         public virtual void AddRegion(Scene scene)
         {
-            if (!m_enabled) 
-                return;
+            if (!m_enabled) return;
 
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnChatFromWorld += OnChatFromWorld;
-            scene.EventManager.OnChatBroadcast += OnChatBroadcast;
+            lock (m_syncy)
+            {
+                if (!m_scenes.Contains(scene))
+                {
+                    m_scenes.Add(scene);
+                    scene.EventManager.OnNewClient += OnNewClient;
+                    scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+                    scene.EventManager.OnChatBroadcast += OnChatBroadcast;
+                }
+            }
 
             m_log.InfoFormat("[CHAT]: Initialized for {0} w:{1} s:{2} S:{3}", scene.RegionInfo.RegionName,
                              m_whisperdistance, m_saydistance, m_shoutdistance);
@@ -103,14 +110,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
         public virtual void RemoveRegion(Scene scene)
         {
-            if (!m_enabled) 
-                return;
+            if (!m_enabled) return;
 
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
-            scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
+            lock (m_syncy)
+            {
+                if (m_scenes.Contains(scene))
+                {
+                    scene.EventManager.OnNewClient -= OnNewClient;
+                    scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
+                    scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
+                    m_scenes.Remove(scene);
+                }
+            }
         }
-        
+
         public virtual void Close()
         {
         }
@@ -119,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         {
         }
 
-        public Type ReplaceableInterface 
+        public virtual Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -137,7 +150,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             client.OnChatFromClient += OnChatFromClient;
         }
 
-        protected OSChatMessage FixPositionOfChatMessage(OSChatMessage c)
+        protected virtual OSChatMessage FixPositionOfChatMessage(OSChatMessage c)
         {
             ScenePresence avatar;
             Scene scene = (Scene)c.Scene;
@@ -165,7 +178,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            DeliverChatToAvatars(ChatSourceType.Agent, c);
+            if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
+            {
+                if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
+                    c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
+            }
+            else
+            {
+                DeliverChatToAvatars(ChatSourceType.Agent, c);
+            }
         }
 
         public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -179,34 +200,63 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
         {
             string fromName = c.From;
+            string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
-            UUID targetID = c.TargetUUID;
             string message = c.Message;
-            Scene scene = (Scene)c.Scene;
+            Scene scene = c.Scene as Scene;
+            UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
 
+            bool checkParcelHide = false;
+            UUID sourceParcelID = UUID.Zero;
+            Vector3 hidePos = fromPos;
+
             if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
 
-            switch (sourceType) 
+            if(!m_scenes.Contains(scene))
             {
-            case ChatSourceType.Agent:
-                ScenePresence avatar = scene.GetScenePresence(c.Sender.AgentId);
-                fromPos = avatar.AbsolutePosition;
-                fromName = avatar.Name;
-                fromID = c.Sender.AgentId;
-                ownerID = c.Sender.AgentId;
+                m_log.WarnFormat("[CHAT]: message from unkown scene {0} ignored",
+                                     scene.RegionInfo.RegionName);
+                return;
+            }
 
-                break;
+            switch (sourceType)
+            {
+                case ChatSourceType.Agent:
+                    ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
+                    fromPos = avatar.AbsolutePosition;
+                    fromName = avatar.Name;
+                    fromID = c.Sender.AgentId;
+                    if (avatar.IsViewerUIGod)
+                    { // let gods speak to outside or things may get confusing
+                        fromNamePrefix = m_adminPrefix;
+                        checkParcelHide = false;
+                    }
+                    else
+                    {
+                        checkParcelHide = true;
+                    }
+                    destination = UUID.Zero; // Avatars cant "SayTo"
+                    ownerID = c.Sender.AgentId;
 
-            case ChatSourceType.Object:
-                fromID = c.SenderUUID;
+                    hidePos = fromPos;
+                    break;
 
-                if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
-                    ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+                case ChatSourceType.Object:
+                    fromID = c.SenderUUID;
 
-                break;
+                    if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
+                    {
+                        ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+                        if (((SceneObjectPart)c.SenderObject).ParentGroup.IsAttachment)
+                        {
+                            checkParcelHide = true;
+                            hidePos = ((SceneObjectPart)c.SenderObject).ParentGroup.AbsolutePosition;
+                        }
+                    }
+                    break;
             }
 
             // TODO: iterate over message
@@ -214,43 +264,66 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}, targetID {5}",
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}",
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
 
-            if (targetID == UUID.Zero)
+            if (checkParcelHide)
             {
-                // This should use ForEachClient, but clients don't have a position.
-                // If camera is moved into client, then camera position can be used
-                scene.ForEachScenePresence(
-                    delegate(ScenePresence presence)
+                checkParcelHide = false;
+                if (c.Type < ChatTypeEnum.DebugChannel && destination == UUID.Zero)
+                {
+                    ILandObject srcland = scene.LandChannel.GetLandObject(hidePos.X, hidePos.Y);
+                    if (srcland != null && !srcland.LandData.SeeAVs)
                     {
-                        if (TrySendChatMessage(
-                            presence, fromPos, regionPos, fromID, ownerID, fromName, c.Type, message, sourceType, false))
-                            receiverIDs.Add(presence.UUID);
+                        sourceParcelID = srcland.LandData.GlobalID;
+                        checkParcelHide = true;
                     }
-                );
-            }
-            else
-            {
-                // This is a send to a specific client eg from llRegionSayTo
-                // no need to check distance etc, jand send is as say
-                ScenePresence presence = scene.GetScenePresence(targetID);
-                if (presence != null && !presence.IsChildAgent)
-                {
-                    if (TrySendChatMessage(
-                        presence, fromPos, regionPos, fromID, ownerID, fromName, ChatTypeEnum.Say, message, sourceType, true))
-                        receiverIDs.Add(presence.UUID);
                 }
             }
 
+            scene.ForEachScenePresence(
+                delegate(ScenePresence presence)
+                {
+                    if (destination != UUID.Zero && presence.UUID != destination)
+                        return;
+
+                    if(presence.IsChildAgent)
+                        {
+                            if(checkParcelHide)
+                                return;
+                            if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
+                                        ownerID, fromNamePrefix + fromName, c.Type,
+                                        message, sourceType, (destination != UUID.Zero)))
+                                receiverIDs.Add(presence.UUID);
+                            return;
+                        }
+
+                    ILandObject Presencecheck = scene.LandChannel.GetLandObject(presence.AbsolutePosition.X,            presence.AbsolutePosition.Y);
+                    if (Presencecheck != null)
+                    {
+                        if (checkParcelHide)
+                        {
+                            if (sourceParcelID != Presencecheck.LandData.GlobalID && !presence.IsViewerUIGod)
+                                return;
+                        }
+                        if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
+                        {
+                            if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
+                                        ownerID, fromNamePrefix + fromName, c.Type,
+                                        message, sourceType, (destination != UUID.Zero)))
+                                receiverIDs.Add(presence.UUID);
+                        }
+                    }
+                });
+
             scene.EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
 
-        static private Vector3 CenterOfRegion = new Vector3(128, 128, 30);
-        
+        static protected Vector3 CenterOfRegion = new Vector3(128, 128, 30);
+
         public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
         {
             if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
@@ -268,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             // broadcast chat works by redistributing every incoming chat
             // message to each avatar in the scene.
             string fromName = c.From;
-            
+
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
             ChatSourceType sourceType = ChatSourceType.Object;
@@ -280,35 +353,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 ownerID = c.Sender.AgentId;
                 sourceType = ChatSourceType.Agent;
             }
-            else if (c.SenderUUID != UUID.Zero) 
+            else if (c.SenderUUID != UUID.Zero)
             {
                 fromID = c.SenderUUID;
                 ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
             }
-            
-            // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
 
+            // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-            
-            ((Scene)c.Scene).ForEachRootClient(
-                delegate(IClientAPI client)
-                {   
-                    // don't forward SayOwner chat from objects to
-                    // non-owner agents
-                    if ((c.Type == ChatTypeEnum.Owner) &&
-                        (null != c.SenderObject) &&
-                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                        return;
 
-                    client.SendChatMessage(
-                        c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID,
-                        (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-
-                    receiverIDs.Add(client.AgentId);
-                });
-            
-            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
-                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+            if (c.Scene != null)
+            {
+                ((Scene)c.Scene).ForEachRootClient
+                (
+                    delegate(IClientAPI client)
+                    {
+                        // don't forward SayOwner chat from objects to
+                        // non-owner agents
+                        if ((c.Type == ChatTypeEnum.Owner) &&
+                            (null != c.SenderObject) &&
+                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                            return;
+
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                        receiverIDs.Add(client.AgentId);
+                    }
+                );
+                (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                    fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+             }
         }
 
         /// <summary>
@@ -326,7 +400,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// <param name="type"></param>
         /// <param name="message"></param>
         /// <param name="src"></param>
-        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a 
+        /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a
         /// precondition</returns>
         protected virtual bool TrySendChatMessage(
             ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
@@ -356,15 +430,44 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             presence.ControllingClient.SendChatMessage(
                 message, (byte) type, fromPos, fromName,
                 fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
-            
+
             return true;
         }
 
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+        public virtual void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            System.Threading.Timer Timer;
+            if (flags == 0)
+            {
+                FreezeCache.Add(target.ToString());
+                System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
+                Timers.Add(target, Timer);
+            }
+            else
+            {
+                FreezeCache.Remove(target.ToString());
+                Timers.TryGetValue(target, out Timer);
+                Timers.Remove(target);
+                Timer.Dispose();
+            }
+        }
+
+        protected virtual void OnEndParcelFrozen(object avatar)
+        {
+            UUID target = (UUID)avatar;
+            FreezeCache.Remove(target.ToString());
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(target, out Timer);
+            Timers.Remove(target);
+            Timer.Dispose();
+        }
         #region SimulatorFeaturesRequest
 
-        static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange;
+        protected static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange;
 
-        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        protected virtual void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
         {
             OSD extras = new OSDMap();
             if (features.ContainsKey("OpenSimExtras"))
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
index 3018d94..5457dc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -41,12 +41,13 @@ 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
 {
     [TestFixture]
     public class ChatModuleTests : OpenSimTestCase
-    {  
+    {
         [TestFixtureSetUp]
         public void FixtureInit()
         {
@@ -65,14 +66,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
         }
 
         private void SetupNeighbourRegions(TestScene sceneA, TestScene sceneB)
-        {            
-            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the 
+        {
+            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the
             // CapabilitiesModule complain when it can't set up HTTP endpoints.
-            //            BaseHttpServer httpServer = new BaseHttpServer(99999);
-            //            MainServer.AddHttpServer(httpServer);
-            //            MainServer.Instance = httpServer;
+            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            MainServer.AddHttpServer(httpServer);
+            MainServer.Instance = httpServer;
 
-            // We need entity transfer modules so that when sp2 logs into the east region, the region calls 
+            // We need entity transfer modules so that when sp2 logs into the east region, the region calls
             // EntityTransferModuleto set up a child agent on the west region.
             // XXX: However, this is not an entity transfer so is misleading.
             EntityTransferModule etmA = new EntityTransferModule();
@@ -86,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             modulesConfig.Set("SimulationServices", lscm.Name);
 
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
-            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());           
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB, new ChatModule());
         }
 
@@ -110,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(250, 128, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);            
+            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);
 
             SetupNeighbourRegions(sceneWest, sceneEast);
 
@@ -123,12 +124,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneWest, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -137,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -146,19 +147,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z), 
+                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -166,11 +167,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             sp1Position = new Vector3(30, 128, 20);
             sp1.AbsolutePosition = sp1Position;
+            sceneWest.Update(1);
             sceneEast.Update(1);
+            Thread.Sleep(12000); // child updates are now time limited
+            sceneWest.Update(5);
+            sceneEast.Update(5);
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
@@ -197,8 +202,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(128, 6, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);            
+            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);
 
             SetupNeighbourRegions(sceneNorth, sceneSouth);
 
@@ -210,12 +215,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneSouth, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneSouth, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -224,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneNorth, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -233,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z), 
+                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -254,16 +259,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             sp1Position = new Vector3(30, 128, 20);
             sp1.AbsolutePosition = sp1Position;
             sceneNorth.Update(1);
+            sceneSouth.Update(1);
+            Thread.Sleep(12000); // child updates are now time limited
+            sceneNorth.Update(5);
+            sceneSouth.Update(5);
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
             TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
         }
-    
+
         private void TestUserInRange(TestClient speakClient, string testMessage, ref string receivedMessage)
         {
             receivedMessage = "";