ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
This commit is contained in:
Melanie
2012-01-30 16:38:11 +00:00
parent 9a86a713d3 3de534896e
commit 1b600e7803
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -857,3 +857,9 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
COMMIT;
:VERSION 40 #---------------- Parcels for sale
BEGIN;
ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
COMMIT;