diff options
| author | Justin Clark-Casey (justincc) | 2012-05-18 23:56:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-18 23:56:44 +0100 |
| commit | fc5d2742298cb00bfa8187349f30bd7c25576828 (patch) | |
| tree | 7caab0da08ba1667a2f6c08d7210e30708313443 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Fix issue where a new outfit folder is not created when a new outfit is saved... (diff) | |
| parent | Provide Telehub setting to allow use of landmarks (diff) | |
| download | opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.zip opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.gz opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.bz2 opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0c66e49..6022175 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3929,7 +3929,8 @@ 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 || | 3932 | // (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || |
| 3933 | (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) || | ||
| 3933 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3934 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
| 3934 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) | 3935 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) |
| 3935 | { | 3936 | { |