diff options
author | Melanie | 2011-01-28 03:35:59 +0100 |
---|---|---|
committer | Melanie | 2011-01-28 03:35:59 +0100 |
commit | 3834000778b121a963ddbda8d5c2a9a2cd554569 (patch) | |
tree | cf3d05e0639b3af18cad4e2b80427df8797a6027 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-3834000778b121a963ddbda8d5c2a9a2cd554569.zip opensim-SC_OLD-3834000778b121a963ddbda8d5c2a9a2cd554569.tar.gz opensim-SC_OLD-3834000778b121a963ddbda8d5c2a9a2cd554569.tar.bz2 opensim-SC_OLD-3834000778b121a963ddbda8d5c2a9a2cd554569.tar.xz |
Change the way ban lines work
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9bcaf32..4f24415 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -367,10 +367,18 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
367 | private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position) | 367 | private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position) |
368 | { | 368 | { |
369 | if (m_scene.Permissions.IsGod(avatar.UUID)) return; | 369 | if (m_scene.Permissions.IsGod(avatar.UUID)) return; |
370 | if (position.HasValue) | 370 | |
371 | { | 371 | if (!position.HasValue) |
372 | forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position; | 372 | return; |
373 | } | 373 | |
374 | bool isFlying = avatar.PhysicsActor.Flying; | ||
375 | avatar.RemoveFromPhysicalScene(); | ||
376 | |||
377 | avatar.AbsolutePosition = (Vector3)position; | ||
378 | |||
379 | avatar.AddToPhysicalScene(isFlying); | ||
380 | |||
381 | forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position; | ||
374 | } | 382 | } |
375 | 383 | ||
376 | public void SendYouAreRestrictedNotice(ScenePresence avatar) | 384 | public void SendYouAreRestrictedNotice(ScenePresence avatar) |