*Ban lines now work if they are enabled grid wide.

*Restricted lines just give you a friendly warning for now

2 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3d4c4bb..0cb353c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -821,8 +821,16 @@ namespace OpenSim.Region.Environment.Scenes
             Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
             if (dGridSettings.ContainsKey("allow_forceful_banlines"))
             {
-                if (dGridSettings["allow_forceful_banlines"] != "TRUE") 
-                    MainLog.Instance.Verbose("GRID","Grid is disabling forceful parcel banlists");
+                if (dGridSettings["allow_forceful_banlines"] != "TRUE")
+                {
+                    MainLog.Instance.Verbose("GRID", "Grid is disabling forceful parcel banlists");
+                    m_LandManager.allowedForcefulBans = false;
+                }
+                else
+                {
+                    MainLog.Instance.Verbose("GRID", "Grid is allowing forceful parcel banlists");
+                    m_LandManager.allowedForcefulBans = true;
+                }
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index a221243..e30c564 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -45,6 +45,8 @@ namespace OpenSim.Region.Environment.Scenes
         public LLUUID currentParcelUUID = LLUUID.Zero;
         private List<LLUUID> m_animations = new List<LLUUID>();
         private List<int> m_animationSeqs = new List<int>();
+        public Vector3 lastKnownAllowedPosition = new Vector3();
+        public bool sentMessageAboutRestrictedParcelFlyingDown = false;
 
         private bool m_updateflag = false;
         private byte m_movementflag = 0;