Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/RegionSettings.cs

1 files changed, 3 insertions, 12 deletions

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;