3 files changed, 16 insertions, 5 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 800de8a..48465d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -787,7 +787,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             reply.ChatData.OwnerID = fromAgentID;
             reply.ChatData.SourceID = fromAgentID;
 
-            OutPacket(reply, ThrottleOutPacketType.Task);
+            OutPacket(reply, ThrottleOutPacketType.Unknown);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index c6a1614..27e492b 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Security;
+using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -45,6 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private delegate void LookupUUIDS(List<UUID> uuidLst);
 
         private Scene m_scene;
+        private Timer m_regionChangeTimer = new Timer();
 
         private EstateTerrainXferHandler TerrainUploader;
 
@@ -898,6 +900,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_scene.RegisterModuleInterface<IEstateModule>(this);
             m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
             m_scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight;
+            m_regionChangeTimer.AutoReset = false;
+            m_regionChangeTimer.Interval = 2000;
+            m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
 
             m_scene.AddCommand(this, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
@@ -949,8 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                     }
                     m_scene.RegionInfo.RegionSettings.Save();
-                    //TriggerRegionInfoChange();
-                    TriggerEstateInfoChange();
+                    TriggerRegionInfoChange();
                     sendRegionInfoPacketToAll();
 
                 }
@@ -996,8 +1000,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                     }
                     m_scene.RegionInfo.RegionSettings.Save();
-                    //TriggerRegionInfoChange();
-                    TriggerEstateInfoChange();
+                    TriggerRegionInfoChange();
                     sendRegionHandshakeToAll();
                 }
             }
@@ -1170,6 +1173,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         protected void TriggerRegionInfoChange()
         {
+            m_regionChangeTimer.Stop();
+            m_regionChangeTimer.Start();
+        }
+
+        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+        {
             ChangeDelegate change = OnRegionInfoChange;
 
             if (change != null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7e83634..7a97669 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -728,6 +728,8 @@ namespace OpenSim.Region.Framework.Scenes
                 // TODO: Change default to true once the feature is supported
                 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
                 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
+
+                m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");
                 if (RegionInfo.NonphysPrimMax > 0)
                 {
                     m_maxNonphys = RegionInfo.NonphysPrimMax;