Merge branch 'master' into bullet-2.82

1 files changed, 17 insertions, 0 deletions

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();