diff options
| author | Melanie | 2013-04-02 23:47:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-02 23:47:19 +0100 |
| commit | 41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch) | |
| tree | c5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /OpenSim/Data | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff) | |
| download | opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2 opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MSSQL/Resources/RegionStore.migrations | 12 |
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 | ||
| 1154 | BEGIN TRANSACTION | 1154 | BEGIN TRANSACTION |
| 1155 | 1155 | ||
| 1156 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | 1156 | ALTER TABLE prims ADD DynAttrs TEXT; |
| 1157 | 1157 | ||
| 1158 | COMMIT | 1158 | COMMIT |
| 1159 | 1159 | ||
| @@ -1161,10 +1161,10 @@ COMMIT | |||
| 1161 | 1161 | ||
| 1162 | BEGIN TRANSACTION | 1162 | BEGIN TRANSACTION |
| 1163 | 1163 | ||
| 1164 | ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0'; | 1164 | ALTER TABLE prims ADD `PhysicsShapeType` tinyint(4) NOT NULL default '0'; |
| 1165 | ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000'; | 1165 | ALTER TABLE prims ADD `Density` double NOT NULL default '1000'; |
| 1166 | ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1'; | 1166 | ALTER TABLE prims ADD `GravityModifier` double NOT NULL default '1'; |
| 1167 | ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6'; | 1167 | ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6'; |
| 1168 | ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5'; | 1168 | ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5'; |
| 1169 | 1169 | ||
| 1170 | COMMIT | 1170 | COMMIT |