diff options
| author | Melanie | 2012-09-29 19:21:07 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-29 19:21:07 +0100 |
| commit | 71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch) | |
| tree | b1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /OpenSim/Data | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2 opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/GridUserStore.migrations | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations index 440d076..d08e096 100644 --- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations +++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations | |||
| @@ -19,9 +19,6 @@ CREATE TABLE `GridUser` ( | |||
| 19 | COMMIT; | 19 | COMMIT; |
| 20 | 20 | ||
| 21 | :VERSION 2 # -------------------------- | 21 | :VERSION 2 # -------------------------- |
| 22 | |||
| 23 | BEGIN; | 22 | BEGIN; |
| 24 | 23 | ||
| 25 | ALTER TABLE `GridUser` ADD COLUMN TOS CHAR(36); | ||
| 26 | |||
| 27 | COMMIT; | 24 | COMMIT; |