diff options
| author | Robert Adams | 2014-01-19 07:38:53 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-19 07:38:53 -0800 |
| commit | f127e4b4ee916a429ef1d9922432869d4138e214 (patch) | |
| tree | be90e6cea8d61088e8380e7027881a8d13f67849 /OpenSim/Data/MySQL | |
| parent | varregion: Update Warp3D to properly handle varregions. (diff) | |
| parent | Fix casting error for float type INI file parameter parsing. (diff) | |
| download | opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.zip opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.gz opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.bz2 opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Data/MySQL')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/IM_Store.migrations | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations index 7cfcd43..f73475e 100644 --- a/OpenSim/Data/MySQL/Resources/IM_Store.migrations +++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations | |||
| @@ -21,4 +21,14 @@ INSERT INTO `im_offline` SELECT * from `diva_im_offline`; | |||
| 21 | DROP TABLE `diva_im_offline`; | 21 | DROP TABLE `diva_im_offline`; |
| 22 | DELETE FROM `migrations` WHERE name='diva_im_Store'; | 22 | DELETE FROM `migrations` WHERE name='diva_im_Store'; |
| 23 | 23 | ||
| 24 | COMMIT; \ No newline at end of file | 24 | COMMIT; |
| 25 | |||
| 26 | :VERSION 3 # -------------------------- | ||
| 27 | |||
| 28 | BEGIN; | ||
| 29 | |||
| 30 | ALTER TABLE `im_offline` | ||
| 31 | ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`, | ||
| 32 | ADD KEY `FromID` (`FromID`); | ||
| 33 | |||
| 34 | COMMIT; | ||