OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon.

avinationmerge
CasperW 2010-02-25 12:04:51 +01:00
parent 92a8d7ce6c
commit efd4810851
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -722,8 +722,10 @@ namespace OpenSim.Region.Framework.Scenes
//Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni.
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) 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)
{ {
avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false); //Disabling this behaviour for now pending review. ~CasperW
position = currentPos;
//avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false);
//position = currentPos;
} }
} }
else else