aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/Resources/RegionStore.migrations
diff options
context:
space:
mode:
authorMelanie2012-01-24 00:36:42 +0000
committerMelanie2012-01-24 00:36:42 +0000
commit07ad821157a5e86d706114645eee1339a6ba51ae (patch)
treec2cf6cdd466fc6e492e95a852b94cbbc7604ee83 /OpenSim/Data/MySQL/Resources/RegionStore.migrations
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentChange Telehubs to store only the data that is really needed and not (diff)
downloadopensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.zip
opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.gz
opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.bz2
opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/RegionStore.migrations')
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations15
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;
848BEGIN; 848BEGIN;
849CREATE TABLE IF NOT EXISTS `spawn_points` ( 849CREATE TABLE IF NOT EXISTS `spawn_points` (
850 `RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL, 850 `RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
851 `PointX` float NOT NULL, 851 `Yaw` float NOT NULL,
852 `PointY` float NOT NULL, 852 `Pitch` float NOT NULL,
853 `PointZ` float NOT NULL, 853 `Distance` float NOT NULL,
854 KEY `RegionID` (`RegionID`) 854 KEY `RegionID` (`RegionID`)
855) ENGINE=Innodb; 855) ENGINE=Innodb;
856 856
857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; 857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
858ALTER TABLE `regionsettings` ADD COLUMN `TelehubName` varchar(255) NOT NULL;
859ALTER TABLE `regionsettings` ADD COLUMN `TelehubEnabled` tinyint(4) NOT NULL;
860ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosX` float NOT NULL;
861ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosY` float NOT NULL;
862ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosZ` float NOT NULL;
863ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotX` float NOT NULL;
864ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotY` float NOT NULL;
865ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotZ` float NOT NULL;
866ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotW` float NOT NULL;
867COMMIT; 858COMMIT;
868 859