aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d09b895..29eed67 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -576,12 +576,14 @@ namespace OpenSim.Region.Framework.Scenes
576 public string SpawnPointRouting 576 public string SpawnPointRouting
577 { 577 {
578 get { return m_SpawnPointRouting; } 578 get { return m_SpawnPointRouting; }
579 private set { m_SpawnPointRouting = value; }
579 } 580 }
580 // allow landmarks to pass 581 // allow landmarks to pass
581 private bool m_TelehubAllowLandmarks; 582 private bool m_TelehubAllowLandmarks;
582 public bool TelehubAllowLandmarks 583 public bool TelehubAllowLandmarks
583 { 584 {
584 get { return m_TelehubAllowLandmarks; } 585 get { return m_TelehubAllowLandmarks; }
586 private set { m_TelehubAllowLandmarks = value; }
585 } 587 }
586 588
587 #endregion Properties 589 #endregion Properties
@@ -738,8 +740,8 @@ namespace OpenSim.Region.Framework.Scenes
738 740
739 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 741 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
740 742
741 m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); 743 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
742 m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); 744 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
743 745
744 IConfig packetConfig = m_config.Configs["PacketPool"]; 746 IConfig packetConfig = m_config.Configs["PacketPool"];
745 if (packetConfig != null) 747 if (packetConfig != null)
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)