diff options
author | Melanie | 2012-02-04 11:48:20 +0000 |
---|---|---|
committer | Melanie | 2012-02-04 11:48:20 +0000 |
commit | ce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch) | |
tree | c906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/Data/MySQL/Resources/RegionStore.migrations | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add default value to TelehubObject (diff) | |
download | opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2 opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/RegionStore.migrations')
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index dae704c..ef99ef8 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -863,3 +863,23 @@ BEGIN; | |||
863 | ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | 863 | ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; |
864 | COMMIT; | 864 | COMMIT; |
865 | 865 | ||
866 | :VERSION 41 #---------------- Timed bans/access | ||
867 | |||
868 | BEGIN; | ||
869 | ALTER TABLE `landaccesslist` ADD COLUMN `Expires` INTEGER NOT NULL DEFAULT 0; | ||
870 | COMMIT; | ||
871 | |||
872 | :VERSION 42 #--------------------- Region Covenant changed time | ||
873 | |||
874 | BEGIN; | ||
875 | ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0'; | ||
876 | COMMIT; | ||
877 | |||
878 | :VERSION 43 #--------------------- | ||
879 | |||
880 | BEGIN; | ||
881 | |||
882 | ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
883 | |||
884 | COMMIT; | ||
885 | |||