2 files changed, 16 insertions, 51 deletions

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index bddb971..a346548 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1012,9 +1012,7 @@ namespace OpenSim.Data.MySQL
                             "covenant, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
                             "loaded_creation_id, map_tile_ID, block_search, casino, " +
-                            "TelehubEnabled, TelehubObject, TelehubName, " +
-                            "TelehubPosX, TelehubPosY, TelehubPosZ, " +
-                            "TelehubRotX, TelehubRotY, TelehubRotZ, TelehubRotW) " +
+                            "TelehubObject) " +
                              "values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                             "?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -1031,9 +1029,7 @@ namespace OpenSim.Data.MySQL
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
                             "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubEnabled, ?TelehubObject, ?TelehubName, " +
-                            "?TelehubPosX, ?TelehubPosY, ?TelehubPosZ, " +
-                            "?TelehubRotX, ?TelehubRotY, ?TelehubRotZ, ?TelehubRotW )";
+                            "?TelehubObject, " +
 
                         FillRegionSettingsCommand(cmd, rs);
 
@@ -1321,20 +1317,7 @@ namespace OpenSim.Data.MySQL
                 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
 
             newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
-            newSettings.HasTelehub = Convert.ToBoolean(row["TelehubEnabled"]);
             newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
-            newSettings.TelehubName = (string) row["TelehubName"];
-            newSettings.TelehubPos = new Vector3 (
-                                                    Convert.ToSingle(row["TelehubPosX"]),
-                                                    Convert.ToSingle(row["TelehubPosY"]),
-                                                    Convert.ToSingle(row["TelehubPosZ"])
-                                                  );
-            newSettings.TelehubRot = new Quaternion (
-                                                      Convert.ToSingle(row["TelehubRotX"]),
-                                                      Convert.ToSingle(row["TelehubRotY"]),
-                                                      Convert.ToSingle(row["TelehubRotZ"]),
-                                                      Convert.ToSingle(row["TelehubRotW"])
-                                                    );
 
             newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
             newSettings.Casino = Convert.ToBoolean(row["casino"]);
@@ -1675,16 +1658,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
             cmd.Parameters.AddWithValue("casino", settings.Casino);
 
-            cmd.Parameters.AddWithValue("TelehubEnabled", settings.HasTelehub);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
-            cmd.Parameters.AddWithValue("TelehubName", settings.TelehubName);
-            cmd.Parameters.AddWithValue("TelehubPosX", settings.TelehubPos.X);
-            cmd.Parameters.AddWithValue("TelehubPosY", settings.TelehubPos.Y);
-            cmd.Parameters.AddWithValue("TelehubPosZ", settings.TelehubPos.Z);
-            cmd.Parameters.AddWithValue("TelehubRotX", settings.TelehubRot.X);
-            cmd.Parameters.AddWithValue("TelehubRotY", settings.TelehubRot.Y);
-            cmd.Parameters.AddWithValue("TelehubRotZ", settings.TelehubRot.Z);
-            cmd.Parameters.AddWithValue("TelehubRotW", settings.TelehubRot.W);
         }
 
         /// <summary>
@@ -1899,20 +1873,20 @@ namespace OpenSim.Data.MySQL
 
                     using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
-                        cmd.CommandText = "select PointX, PointY, PointZ from spawn_points where RegionID = ?RegionID";
+                        cmd.CommandText = "select Yaw, Pitch, Distance from spawn_points where RegionID = ?RegionID";
                         cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
 
                         using (IDataReader r = cmd.ExecuteReader())
                         {
                             while (r.Read())
                             {
-                                Vector3 point = new Vector3();
+                                SpawnPoint sp = new SpawnPoint();
 
-                                point.X = (float)r["PointX"];
-                                point.Y = (float)r["PointY"];
-                                point.Z = (float)r["PointZ"];
+                                sp.Yaw = (float)r["Yaw"];
+                                sp.Pitch = (float)r["Pitch"];
+                                sp.Distance = (float)r["Distance"];
 
-                                rs.AddSpawnPoint(point);
+                                rs.AddSpawnPoint(sp);
                             }
                         }
                     }
@@ -1937,14 +1911,14 @@ namespace OpenSim.Data.MySQL
 
                         cmd.Parameters.Clear();
 
-                        cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?RegionID, ?PointX, ?PointY,?PointZ)";
+                        cmd.CommandText = "insert into spawn_points (RegionID, Yaw, Pitch, Distance) values ( ?RegionID, ?Yaw, ?Pitch, ?Distance)";
 
-                        foreach (Vector3 p in rs.SpawnPoints())
+                        foreach (SpawnPoint p in rs.SpawnPoints())
                         {
                             cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
-                            cmd.Parameters.AddWithValue("?PointX", p.X);
-                            cmd.Parameters.AddWithValue("?PointY", p.Y);
-                            cmd.Parameters.AddWithValue("?PointZ", p.Z);
+                            cmd.Parameters.AddWithValue("?Yaw", p.Yaw);
+                            cmd.Parameters.AddWithValue("?Pitch", p.Pitch);
+                            cmd.Parameters.AddWithValue("?Distance", p.Distance);
 
                             cmd.ExecuteNonQuery();
                             cmd.Parameters.Clear();
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 3872a75..219de62 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -848,21 +848,12 @@ COMMIT;
 BEGIN;
 CREATE TABLE IF NOT EXISTS `spawn_points` (
   `RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
-  `PointX` float NOT NULL,
-  `PointY` float NOT NULL,
-  `PointZ` float NOT NULL,
+  `Yaw` float NOT NULL,
+  `Pitch` float NOT NULL,
+  `Distance` float NOT NULL,
   KEY `RegionID` (`RegionID`)
 ) ENGINE=Innodb;
 
 ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubName` varchar(255) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubEnabled` tinyint(4) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosX` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosY` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosZ` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotX` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotY` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotZ` float NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotW` float NOT NULL;
 COMMIT;