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

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-01-09 19:22:06 +00:00
parent 520b8b342e 3640afdd95
commit bc08cc201b
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3845,6 +3845,24 @@ namespace OpenSim.Region.Framework.Scenes
private void CheckAndAdjustLandingPoint(ref Vector3 pos) private void CheckAndAdjustLandingPoint(ref Vector3 pos)
{ {
// // Some temporary debugging help to show all the TeleportFlags we have...
// bool HG = false;
// if((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin)
// HG = true;
//
// m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
//
// for (uint i = 0; i <= 30 ; i++)
// {
// if((m_teleportFlags & (TeleportFlags)i) == (TeleportFlags)i)
// if (HG == false)
// m_log.InfoFormat("[SCENE PRESENCE]: Teleport Flags include {0}", ((TeleportFlags) i).ToString());
// else
// m_log.InfoFormat("[SCENE PRESENCE]: HG Teleport Flags include {0}", ((TeleportFlags)i).ToString());
// }
//
// m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
if (land != null) if (land != null)
{ {
@ -3864,7 +3882,8 @@ namespace OpenSim.Region.Framework.Scenes
GodLevel < 200 && GodLevel < 200 &&
((land.LandData.OwnerID != m_uuid && ((land.LandData.OwnerID != m_uuid &&
(!m_scene.Permissions.IsGod(m_uuid)) && (!m_scene.Permissions.IsGod(m_uuid)) &&
(!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0)) (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0) ||
((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin))
{ {
pos = land.LandData.UserLocation; pos = land.LandData.UserLocation;
} }