From 895dadbdbdc0468fd1a0a9e146e1bf65279a2de7 Mon Sep 17 00:00:00 2001
From: BlueWall <jamesh@bluewallgroup.com>
Date: Fri, 18 May 2012 19:32:26 -0400
Subject: [PATCH] Cleanup + change properties to set fields with private set :
 Thanks Justin for the tip.

---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 6 ++++--
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d09b8957cf..29eed677bd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -576,12 +576,14 @@ namespace OpenSim.Region.Framework.Scenes
         public string SpawnPointRouting
         {
             get { return m_SpawnPointRouting; }
+            private set { m_SpawnPointRouting = value; }
         }
         // allow landmarks to pass
         private bool m_TelehubAllowLandmarks;
         public bool TelehubAllowLandmarks
         {
             get { return m_TelehubAllowLandmarks; }
+            private set { m_TelehubAllowLandmarks = value; }
         }
 
         #endregion Properties
@@ -738,8 +740,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
 
-                m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
-                m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
+                SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
+                TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
 
                 IConfig packetConfig = m_config.Configs["PacketPool"];
                 if (packetConfig != null)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 602217596c..3adafc1b74 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3929,7 +3929,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
                 (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
-            // (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
                 (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) ||
                 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
                 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)