diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 7e29a56..d00cb07 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
| @@ -147,12 +147,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 147 | { | 147 | { |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason) | 150 | // private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason) |
| 151 | { | 151 | // { |
| 152 | ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y); | 152 | // ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y); |
| 153 | reason = "You are not allowed to enter this sim."; | 153 | // reason = "You are not allowed to enter this sim."; |
| 154 | return nearestParcel != null; | 154 | // return nearestParcel != null; |
| 155 | } | 155 | // } |
| 156 | 156 | ||
| 157 | void EventManagerOnNewClient(IClientAPI client) | 157 | void EventManagerOnNewClient(IClientAPI client) |
| 158 | { | 158 | { |