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/SQLite | |
| 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/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/Resources/EstateStore.migrations | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/Resources/EstateStore.migrations b/OpenSim/Data/SQLite/Resources/EstateStore.migrations index 62f6464..0aec49b 100644 --- a/OpenSim/Data/SQLite/Resources/EstateStore.migrations +++ b/OpenSim/Data/SQLite/Resources/EstateStore.migrations | |||
| @@ -86,3 +86,12 @@ begin; | |||
| 86 | alter table estate_settings add column DenyMinors tinyint not null default 0; | 86 | alter table estate_settings add column DenyMinors tinyint not null default 0; |
| 87 | 87 | ||
| 88 | commit; | 88 | commit; |
| 89 | |||
| 90 | :VERSION 9 | ||
| 91 | |||
| 92 | begin; | ||
| 93 | alter table estate_settings add column AllowLandmark tinyint not null default '1'; | ||
| 94 | alter table estate_settings add column AllowParcelChanges tinyint not null default '1'; | ||
| 95 | alter table estate_settings add column AllowSetHome tinyint not null default '1'; | ||
| 96 | commit; | ||
| 97 | |||