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/MySQL/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_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2 opensim-SC_OLD-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/MySQL/Resources/RegionStore.migrations')
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index c4b0832..0be5587 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -902,3 +902,11 @@ BEGIN; | |||
902 | CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`)); | 902 | CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`)); |
903 | 903 | ||
904 | COMMIT; | 904 | COMMIT; |
905 | |||
906 | :VERSION 46 #---------------- Dynamic attributes | ||
907 | |||
908 | BEGIN; | ||
909 | |||
910 | ALTER TABLE prims ADD COLUMN DynAttrs TEXT; | ||
911 | |||
912 | COMMIT; | ||