aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
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
821 Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings(); 821 Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
822 if (dGridSettings.ContainsKey("allow_forceful_banlines")) 822 if (dGridSettings.ContainsKey("allow_forceful_banlines"))
823 { 823 {
824 if (dGridSettings["allow_forceful_banlines"] != "TRUE") 824 if (dGridSettings["allow_forceful_banlines"] != "TRUE")
825 MainLog.Instance.Verbose("GRID","Grid is disabling forceful parcel banlists"); 825 {
826 MainLog.Instance.Verbose("GRID", "Grid is disabling forceful parcel banlists");
827 m_LandManager.allowedForcefulBans = false;
828 }
829 else
830 {
831 MainLog.Instance.Verbose("GRID", "Grid is allowing forceful parcel banlists");
832 m_LandManager.allowedForcefulBans = true;
833 }
826 } 834 }
827 } 835 }
828 836
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
45 public LLUUID currentParcelUUID = LLUUID.Zero; 45 public LLUUID currentParcelUUID = LLUUID.Zero;
46 private List<LLUUID> m_animations = new List<LLUUID>(); 46 private List<LLUUID> m_animations = new List<LLUUID>();
47 private List<int> m_animationSeqs = new List<int>(); 47 private List<int> m_animationSeqs = new List<int>();
48 public Vector3 lastKnownAllowedPosition = new Vector3();
49 public bool sentMessageAboutRestrictedParcelFlyingDown = false;
48 50
49 private bool m_updateflag = false; 51 private bool m_updateflag = false;
50 private byte m_movementflag = 0; 52 private byte m_movementflag = 0;