diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
2 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 38f371a..1279ac1 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
175 | void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData) | 175 | void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData) |
176 | { | 176 | { |
177 | //If we are forcing a position for them to go | 177 | //If we are forcing a position for them to go |
178 | if( forcedPosition != null ) | 178 | if (forcedPosition != null) |
179 | { | 179 | { |
180 | ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId); | 180 | ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId); |
181 | 181 | ||
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
191 | forcedPosition = null; | 191 | forcedPosition = null; |
192 | } | 192 | } |
193 | //if we are far away, teleport | 193 | //if we are far away, teleport |
194 | else if(Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3 ) | 194 | else if (Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3) |
195 | { | 195 | { |
196 | Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}",forcedPosition.Value,clientAvatar.AbsolutePosition)); | 196 | Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}",forcedPosition.Value,clientAvatar.AbsolutePosition)); |
197 | clientAvatar.Teleport(forcedPosition.Value); | 197 | clientAvatar.Teleport(forcedPosition.Value); |
@@ -332,7 +332,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
332 | 332 | ||
333 | public void SendYouAreRestrictedNotice(ScenePresence avatar) | 333 | public void SendYouAreRestrictedNotice(ScenePresence avatar) |
334 | { | 334 | { |
335 | avatar.ControllingClient.SendAlertMessage( | 335 | avatar.ControllingClient.SendAlertMessage( |
336 | "You are not allowed on this parcel because the land owner has restricted access."); | 336 | "You are not allowed on this parcel because the land owner has restricted access."); |
337 | 337 | ||
338 | } | 338 | } |
@@ -467,7 +467,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
467 | ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar)); | 467 | ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar)); |
468 | } | 468 | } |
469 | } | 469 | } |
470 | else if ( parcel.IsRestrictedFromLand(clientAvatar.UUID)) | 470 | else if (parcel.IsRestrictedFromLand(clientAvatar.UUID)) |
471 | { | 471 | { |
472 | //once we've sent the message once, keep going toward the target until we are done | 472 | //once we've sent the message once, keep going toward the target until we are done |
473 | if (forcedPosition == null) | 473 | if (forcedPosition == null) |
@@ -479,7 +479,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
479 | else | 479 | else |
480 | { | 480 | { |
481 | //when we are finally in a safe place, lets release the forced position lock | 481 | //when we are finally in a safe place, lets release the forced position lock |
482 | forcedPosition = null; | 482 | forcedPosition = null; |
483 | } | 483 | } |
484 | } | 484 | } |
485 | } | 485 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 27d9fdb..e85136a 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
287 | entry.Flags = AccessList.Ban; | 287 | entry.Flags = AccessList.Ban; |
288 | entry.Time = new DateTime(); | 288 | entry.Time = new DateTime(); |
289 | //See if they are on the list, but make sure the owner isn't banned | 289 | //See if they are on the list, but make sure the owner isn't banned |
290 | if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar ) | 290 | if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar) |
291 | { | 291 | { |
292 | //They are banned, so lets send them a notice about this parcel | 292 | //They are banned, so lets send them a notice about this parcel |
293 | return true; | 293 | return true; |