diff options
author | CasperW | 2010-02-25 12:04:51 +0100 |
---|---|---|
committer | CasperW | 2010-02-25 12:04:51 +0100 |
commit | efd481085135f60d8f6d3e4615591a26ec3f05f6 (patch) | |
tree | ca5c92b86f53cb5507865ec71b9351e336291f49 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
download | opensim-SC-efd481085135f60d8f6d3e4615591a26ec3f05f6.zip opensim-SC-efd481085135f60d8f6d3e4615591a26ec3f05f6.tar.gz opensim-SC-efd481085135f60d8f6d3e4615591a26ec3f05f6.tar.bz2 opensim-SC-efd481085135f60d8f6d3e4615591a26ec3f05f6.tar.xz |
Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 9ceab19..5f84252 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -722,8 +722,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
722 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. | 722 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. |
723 | if (destLand.LandData.LandingType == (byte)1 && destLand.LandData.UserLocation != Vector3.Zero && avatar.GodLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar.UUID) && destLand.LandData.OwnerID != avatar.UUID) | 723 | if (destLand.LandData.LandingType == (byte)1 && destLand.LandData.UserLocation != Vector3.Zero && avatar.GodLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar.UUID) && destLand.LandData.OwnerID != avatar.UUID) |
724 | { | 724 | { |
725 | avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false); | 725 | //Disabling this behaviour for now pending review. ~CasperW |
726 | position = currentPos; | 726 | |
727 | //avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false); | ||
728 | //position = currentPos; | ||
727 | } | 729 | } |
728 | } | 730 | } |
729 | else | 731 | else |