From b0b7b45b943dd94546bcfcf5d3bb871cfe35b507 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 3 May 2012 19:38:35 +0300
Subject: Save the Telehub and its Spawn Points in the OAR

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
---
 OpenSim/Framework/RegionSettings.cs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/RegionSettings.cs')

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 4ce3392..011a97a 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
+using System.Runtime.Serialization;
 
 namespace OpenSim.Framework
 {
@@ -71,6 +72,32 @@ namespace OpenSim.Framework
 
             return pos + offset;
         }
+
+        /// <summary>
+        /// Returns a string representation of this SpawnPoint.
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return string.Format("{0},{1},{2}", Yaw, Pitch, Distance);
+        }
+
+        /// <summary>
+        /// Generate a SpawnPoint from a string
+        /// </summary>
+        /// <param name="str"></param>
+        public static SpawnPoint Parse(string str)
+        {
+            string[] parts = str.Split(',');
+            if (parts.Length != 3)
+                throw new ArgumentException("Invalid string: " + str);
+
+            SpawnPoint sp = new SpawnPoint();
+            sp.Yaw = float.Parse(parts[0]);
+            sp.Pitch = float.Parse(parts[1]);
+            sp.Distance = float.Parse(parts[2]);
+            return sp;
+        }
     }
 
     public class RegionSettings
@@ -456,7 +483,7 @@ namespace OpenSim.Framework
         }
 
         // Connected Telehub object
-        private UUID m_TelehubObject;
+        private UUID m_TelehubObject = UUID.Zero;
         public UUID TelehubObject
         {
             get
-- 
cgit v1.1