diff options
| author | Melanie | 2013-05-11 02:35:26 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 02:35:26 +0100 |
| commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
| tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Data/MySQL | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Data/MySQL')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/EstateStore.migrations | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations index df82a2e..2d1c2b5 100644 --- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations | |||
| @@ -77,5 +77,11 @@ BEGIN; | |||
| 77 | ALTER TABLE estate_settings AUTO_INCREMENT = 100; | 77 | ALTER TABLE estate_settings AUTO_INCREMENT = 100; |
| 78 | COMMIT; | 78 | COMMIT; |
| 79 | 79 | ||
| 80 | :VERSION 33 #--------------------- | ||
| 80 | 81 | ||
| 82 | BEGIN; | ||
| 83 | ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1'; | ||
| 84 | ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1'; | ||
| 85 | ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1'; | ||
| 86 | COMMIT; | ||
| 81 | 87 | ||