diff options
| author | Melanie | 2012-01-30 16:38:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 16:38:11 +0000 |
| commit | 1b600e7803a317e722b172c2a3481fc4d24ddc6c (patch) | |
| tree | 227712e3dd9df46b82edaf3e325af4c0a1ca9763 /OpenSim/Data/MySQL/Resources/RegionStore.migrations | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add ParcelImageID to RegionSettings so we can have that overlay. (diff) | |
| download | opensim-SC-1b600e7803a317e722b172c2a3481fc4d24ddc6c.zip opensim-SC-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.gz opensim-SC-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.bz2 opensim-SC-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/RegionStore.migrations')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 219de62..dae704c 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
| @@ -857,3 +857,9 @@ CREATE TABLE IF NOT EXISTS `spawn_points` ( | |||
| 857 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; | 857 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; |
| 858 | COMMIT; | 858 | COMMIT; |
| 859 | 859 | ||
| 860 | :VERSION 40 #---------------- Parcels for sale | ||
| 861 | |||
| 862 | BEGIN; | ||
| 863 | ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
| 864 | COMMIT; | ||
| 865 | |||