Merge branch 'master' into varregion

1 files changed, 7 insertions, 14 deletions

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index db8c53e..a895c40 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -482,21 +482,14 @@ namespace OpenSim.Framework
             set { m_LoadedCreationID = value; }
         }
 
-        // Connected Telehub object
-        private UUID m_TelehubObject = UUID.Zero;
-        public UUID TelehubObject
-        {
-            get
-            {
-                return m_TelehubObject;
-            }
-            set
-            {
-                m_TelehubObject = value;
-            }
-        }
+        /// <summary>
+        /// Connected Telehub object
+        /// </summary>
+        public UUID TelehubObject { get; set; }
 
-        // Our Connected Telehub's SpawnPoints
+        /// <summary>
+        /// Our connected Telehub's SpawnPoints
+        /// </summary>
         public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>();
 
         // Add a SpawnPoint