diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Data/MSSQL/Resources | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MSSQL/Resources/RegionStore.migrations | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations index 4549801..bb89884 100644 --- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations | |||
| @@ -1168,3 +1168,15 @@ ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6'; | |||
| 1168 | ALTER TABLE prims ADD `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 |
| 1171 | |||
| 1172 | :VERSION 40 #---------------- Save Attachment info | ||
| 1173 | |||
| 1174 | BEGIN TRANSACTION | ||
| 1175 | |||
| 1176 | ALTER TABLE prims ADD AttachedPosX float(53) default 0.0; | ||
| 1177 | ALTER TABLE prims ADD AttachedPosY float(53) default 0.0; | ||
| 1178 | ALTER TABLE prims ADD AttachedPosZ float(53) default 0.0; | ||
| 1179 | ALTER TABLE primshapes ADD LastAttachPoint int not null default 0; | ||
| 1180 | |||
| 1181 | COMMIT | ||
| 1182 | |||