diff options
| author | Melanie | 2012-01-09 06:52:46 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-09 06:52:46 +0000 |
| commit | 520b8b342e3d00df575a2679cea1dfb3d9b9c8fc (patch) | |
| tree | 36938087c3cda35816411131d47ada2032c62894 /OpenSim/Region/Framework | |
| parent | Update teleport routing to match Avination (diff) | |
| parent | Fix HG teleport routing (diff) | |
| download | opensim-SC_OLD-520b8b342e3d00df575a2679cea1dfb3d9b9c8fc.zip opensim-SC_OLD-520b8b342e3d00df575a2679cea1dfb3d9b9c8fc.tar.gz opensim-SC_OLD-520b8b342e3d00df575a2679cea1dfb3d9b9c8fc.tar.bz2 opensim-SC_OLD-520b8b342e3d00df575a2679cea1dfb3d9b9c8fc.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e17d886..0a71835 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3851,9 +3851,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3851 | // If we come in via login, landmark or map, we want to | 3851 | // If we come in via login, landmark or map, we want to |
| 3852 | // honor landing points. If we come in via Lure, we want | 3852 | // honor landing points. If we come in via Lure, we want |
| 3853 | // to ignore them. | 3853 | // to ignore them. |
| 3854 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || | 3854 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == |
| 3855 | (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || | ||
| 3855 | (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || | 3856 | (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || |
| 3856 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0) | 3857 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
| 3858 | ((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin)) | ||
| 3857 | { | 3859 | { |
| 3858 | // Don't restrict gods, estate managers, or land owners to | 3860 | // Don't restrict gods, estate managers, or land owners to |
| 3859 | // the TP point. This behaviour mimics agni. | 3861 | // the TP point. This behaviour mimics agni. |