Merge branch 'master' into bullet-2.82

7 files changed, 68 insertions, 46 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index c6e05b1..d7ea906 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
@@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 
         public void Process()
         {
-            httpThread = new Thread(SendRequest);
-            httpThread.Name = "HttpRequestThread";
-            httpThread.Priority = ThreadPriority.BelowNormal;
-            httpThread.IsBackground = true;
             _finished = false;
-            httpThread.Start();
+            Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
         }
 
         /*
@@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             }
 
             _finished = true;
+
+            Watchdog.RemoveThread();
         }
 
         public void Stop()
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 18376c3..5f0dbd7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -224,6 +224,12 @@ namespace OpenSim.Region.Framework.Scenes
         public bool m_clampPrimSize;
         public bool m_trustBinaries;
         public bool m_allowScriptCrossings = true;
+
+        /// <summary>
+        /// Can avatars cross from and to this region?
+        /// </summary>
+        public bool AllowAvatarCrossing { get; set; }
+
         public bool m_useFlySlow;
         public bool m_useTrashOnDelete = true;
 
@@ -1023,6 +1029,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             #endregion Region Config
 
+            IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
+            if (entityTransferConfig != null)
+            {
+                AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
+            }
+
             #region Interest Management
 
             IConfig interestConfig = m_config.Configs["InterestManagement"];
@@ -1091,6 +1103,8 @@ namespace OpenSim.Region.Framework.Scenes
             CollidablePrims = true;
             PhysicsEnabled = true;
 
+            AllowAvatarCrossing = true;
+
             PeriodicBackup = true;
             UseBackup = true;
 
@@ -5613,6 +5627,9 @@ namespace OpenSim.Region.Framework.Scenes
                 return true;
             }
 
+            if (!AllowAvatarCrossing && !viaTeleport)
+                return false;
+
             // FIXME: Root agent count is currently known to be inaccurate.  This forces a recount before we check.
             // However, the long term fix is to make sure root agent count is always accurate.
             m_sceneGraph.RecalculateStats();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e0b7640..3c37de8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -608,8 +608,11 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Current velocity of the avatar.
+        /// Velocity of the avatar with respect to its local reference frame.
         /// </summary>
+        /// <remarks>
+        /// So when sat on a vehicle this will be 0.  To get velocity with respect to the world use GetWorldVelocity()
+        /// </remarks>
         public override Vector3 Velocity
         {
             get
@@ -622,10 +625,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
 //                        m_velocity, Name, Scene.RegionInfo.RegionName);
                 }
-                else if (ParentPart != null)
-                {
-                    return ParentPart.ParentGroup.Velocity;
-                }
+//                else if (ParentPart != null)
+//                {
+//                    return ParentPart.ParentGroup.Velocity;
+//                }
 
                 return m_velocity;
             }
@@ -749,25 +752,32 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Gets the world rotation of this presence.
+        /// Get rotation relative to the world.
         /// </summary>
-        /// <remarks>
-        /// Unlike Rotation, this returns the world rotation no matter whether the avatar is sitting on a prim or not.
-        /// </remarks>
         /// <returns></returns>
         public Quaternion GetWorldRotation()
         {
-            if (IsSatOnObject)
-            {
-                SceneObjectPart sitPart = ParentPart;
+            SceneObjectPart sitPart = ParentPart;
 
-                if (sitPart != null)
-                    return sitPart.GetWorldRotation() * Rotation;
-            }
+            if (sitPart != null)
+                return sitPart.GetWorldRotation() * Rotation;
 
             return Rotation;
         }
 
+        /// <summary>
+        /// Get velocity relative to the world.
+        /// </summary>
+        public Vector3 GetWorldVelocity()
+        {
+            SceneObjectPart sitPart = ParentPart;
+
+            if (sitPart != null)
+                return sitPart.ParentGroup.Velocity;
+
+            return Velocity;
+        }
+
         public void AdjustKnownSeeds()
         {
             Dictionary<ulong, string> seeds;
@@ -3216,7 +3226,8 @@ namespace OpenSim.Region.Framework.Scenes
                     m_lastVelocity = Velocity;
                 }
 
-                CheckForBorderCrossing();
+                if (Scene.AllowAvatarCrossing)
+                    CheckForBorderCrossing();
 
                 CheckForSignificantMovement(); // sends update to the modules.
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index f5bd44d..bdd07e0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
         internal int m_resetk = 0;
 
-        // Working threads
-
-        private Thread m_listener = null;
-
         private Object msyncConnect = new Object();
 
         internal bool m_randomizeNick = true; // add random suffix
@@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
                     m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port);
 
-                    m_listener = new Thread(new ThreadStart(ListenerRun));
-                    m_listener.Name = "IRCConnectorListenerThread";
-                    m_listener.IsBackground = true;
-                    m_listener.Start();
+                    Watchdog.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false);
 
                     // This is the message order recommended by RFC 2812
                     if (m_password != null)
@@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             {
                 while (m_enabled && m_connected)
                 {
-
                     if ((inputLine = m_reader.ReadLine()) == null)
                         throw new Exception("Listener input socket closed");
 
+                    Watchdog.UpdateThread();
+
                     // m_log.Info("[IRCConnector]: " + inputLine);
 
                     if (inputLine.Contains("PRIVMSG"))
                     {
-
                         Dictionary<string, string> data = ExtractMsg(inputLine);
 
                         // Any chat ???
                         if (data != null)
                         {
-
                             OSChatMessage c = new OSChatMessage();
                             c.Message = data["msg"];
                             c.Type = ChatTypeEnum.Region;
@@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                                 c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9));
 
                             ChannelState.OSChat(this, c, false);
-
                         }
-
                     }
                     else
                     {
@@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
             if (m_enabled && (m_resetk == resetk))
                 Reconnect();
+
+            Watchdog.RemoveThread();
         }
 
         private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index f7317c0..a46c241 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework;
 using OpenSim.Region.CoreModules;
 using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
@@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         if (BSParam.UseSeparatePhysicsThread)
         {
             // The physics simulation should happen independently of the heartbeat loop
-            m_physicsThread = new Thread(BulletSPluginPhysicsThread);
-            m_physicsThread.Name = BulletEngineName;
-            m_physicsThread.Start();
+            m_physicsThread 
+                = Watchdog.StartThread(
+                    BulletSPluginPhysicsThread, 
+                    string.Format("{0} ({1})", BulletEngineName, RegionName), 
+                    ThreadPriority.Normal, 
+                    true, 
+                    true);
         }
     }
 
@@ -856,7 +861,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 // TODO.
                 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
             }
+
+            Watchdog.UpdateThread();
         }
+
+        Watchdog.RemoveThread();
     }
 
     #endregion // Simulation
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5d7fc9d..7c384b2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2560,7 +2560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_host.ParentGroup.IsAttachment)
             {
                 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
-                vel = avatar.Velocity;
+                vel = avatar.GetWorldVelocity();
             }
             else
             {
@@ -11221,7 +11221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Rotation(av.GetWorldRotation()));
                                 break;
                             case ScriptBaseClass.OBJECT_VELOCITY:
-                                ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z));
+                                ret.Add(new LSL_Vector(av.GetWorldVelocity()));
                                 break;
                             case ScriptBaseClass.OBJECT_OWNER:
                                 ret.Add(new LSL_String(id));
@@ -11342,7 +11342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                     ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar);
 
                                     if (sp != null)
-                                        vel = sp.Velocity;
+                                        vel = sp.GetWorldVelocity();
                                 }
                                 else
                                 {
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
index ad848a1..06d9e91 100644
--- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
@@ -162,9 +162,6 @@ namespace OpenSim.Region.UserStatistics
                 output.Append("OthrMS");
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDHeaderClass);
-                output.Append("ScrLPS");
-                HTMLUtil.TD_C(ref output);
-                HTMLUtil.TD_O(ref output, TDHeaderClass);
                 output.Append("OutPPS");
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDHeaderClass);
@@ -194,9 +191,6 @@ namespace OpenSim.Region.UserStatistics
                 output.Append(sdata.OtherFrameTime);
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDDataClassCenter);
-                output.Append(sdata.ScriptLinesPerSecond);
-                HTMLUtil.TD_C(ref output);
-                HTMLUtil.TD_O(ref output, TDDataClassCenter);
                 output.Append(sdata.OutPacketsPerSecond);
                 HTMLUtil.TD_C(ref output);
                 HTMLUtil.TD_O(ref output, TDDataClassCenter);