aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2014-06-21 00:22:29 +0200
committerMelanie Thielker2014-06-21 00:22:29 +0200
commite0f360e4953cefae11abd8800fa792e1e401399b (patch)
treec6cc017238ca55e2cf5ca72837488d72b5796b05 /OpenSim
parentMerge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2' (diff)
parentChange recent MSSQL migrations to drop COLUMN from ALTER TABLE which is eithe... (diff)
downloadopensim-SC-e0f360e4953cefae11abd8800fa792e1e401399b.zip
opensim-SC-e0f360e4953cefae11abd8800fa792e1e401399b.tar.gz
opensim-SC-e0f360e4953cefae11abd8800fa792e1e401399b.tar.bz2
opensim-SC-e0f360e4953cefae11abd8800fa792e1e401399b.tar.xz
Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/Resources/RegionStore.migrations12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index b84c2a4..4549801 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1153,7 +1153,7 @@ COMMIT
1153 1153
1154BEGIN TRANSACTION 1154BEGIN TRANSACTION
1155 1155
1156ALTER TABLE prims ADD COLUMN DynAttrs TEXT; 1156ALTER TABLE prims ADD DynAttrs TEXT;
1157 1157
1158COMMIT 1158COMMIT
1159 1159
@@ -1161,10 +1161,10 @@ COMMIT
1161 1161
1162BEGIN TRANSACTION 1162BEGIN TRANSACTION
1163 1163
1164ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0'; 1164ALTER TABLE prims ADD `PhysicsShapeType` tinyint(4) NOT NULL default '0';
1165ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000'; 1165ALTER TABLE prims ADD `Density` double NOT NULL default '1000';
1166ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1'; 1166ALTER TABLE prims ADD `GravityModifier` double NOT NULL default '1';
1167ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6'; 1167ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6';
1168ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5'; 1168ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5';
1169 1169
1170COMMIT 1170COMMIT