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

accept mantis 7785 requests, at least until bullet can be also be used fix landing height. (could not test)

LSLKeyTest
UbitUmarov 2016-01-26 21:42:46 +00:00
parent 668ff1e12c
commit b34652e9eb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -5792,8 +5792,8 @@ namespace OpenSim.Region.Framework.Scenes
return true; return true;
// respect region owner and managers // respect region owner and managers
if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) // if(m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid))
return true; // return true;
if (!m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) if (!m_scene.RegionInfo.EstateSettings.AllowDirectTeleport)
{ {
@ -5823,8 +5823,9 @@ namespace OpenSim.Region.Framework.Scenes
|| (m_teleportFlags & adicionalLandPointFlags) != 0) || (m_teleportFlags & adicionalLandPointFlags) != 0)
{ {
if (land.LandData.LandingType == (byte)LandingType.LandingPoint && if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
land.LandData.UserLocation != Vector3.Zero && land.LandData.UserLocation != Vector3.Zero )
land.LandData.OwnerID != m_uuid ) // &&
// land.LandData.OwnerID != m_uuid )
{ {
pos = land.LandData.UserLocation; pos = land.LandData.UserLocation;
if(land.LandData.UserLookAt != Vector3.Zero) if(land.LandData.UserLookAt != Vector3.Zero)