diff options
| author | Justin Clark-Casey (justincc) | 2012-05-19 02:46:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-19 02:46:37 +0100 |
| commit | 33247c8d85162209e97f118d4f3f3b184bacd991 (patch) | |
| tree | b25e2f0e83aca866475874bf30ef270a0c2bcb5a /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Add is_megaregion flag into oar control file. Not currently read - for futur... (diff) | |
| parent | Further refinement on properties (diff) | |
| download | opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.zip opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.gz opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.bz2 opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6022175..3adafc1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3929,7 +3929,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3929 | { | 3929 | { |
| 3930 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == | 3930 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == |
| 3931 | (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || | 3931 | (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || |
| 3932 | // (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || | ||
| 3933 | (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) || | 3932 | (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) || |
| 3934 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3933 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
| 3935 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) | 3934 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) |