diff options
author | Melanie | 2013-02-05 21:30:12 +0000 |
---|---|---|
committer | Melanie | 2013-02-05 21:30:12 +0000 |
commit | d3892bbd0674e4f6912ce89e54712ea405dbbfb8 (patch) | |
tree | 70ea1e0fea0e7eff5664bed1103e63d08c7b1c47 /OpenSim/Data/MSSQL/Resources/RegionStore.migrations | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2 opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Data/MSSQL/Resources/RegionStore.migrations')
-rw-r--r-- | OpenSim/Data/MSSQL/Resources/RegionStore.migrations | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations index 350e548..92cc38a 100644 --- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations | |||
@@ -1148,3 +1148,11 @@ CREATE TABLE [dbo].[regionenvironment]( | |||
1148 | ) ON [PRIMARY] | 1148 | ) ON [PRIMARY] |
1149 | 1149 | ||
1150 | COMMIT | 1150 | COMMIT |
1151 | |||
1152 | :VERSION 38 #---------------- Dynamic attributes | ||
1153 | |||
1154 | BEGIN TRANSACTION | ||
1155 | |||
1156 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | ||
1157 | |||
1158 | COMMIT | ||