diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Data/MySQL/Resources/UserProfiles.migrations')
| -rw-r--r-- | OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index c29f1ab..bd325da 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
| @@ -81,3 +81,13 @@ CREATE TABLE IF NOT EXISTS `userdata` ( | |||
| 81 | 81 | ||
| 82 | commit; | 82 | commit; |
| 83 | 83 | ||
| 84 | :VERSION 3 # ------------------------------- | ||
| 85 | begin; | ||
| 86 | CREATE TABLE IF NOT EXISTS `usersettings` ( | ||
| 87 | `useruuid` varchar(36) NOT NULL, | ||
| 88 | `imviaemail` enum('true','false') NOT NULL, | ||
| 89 | `visible` enum('true','false') NOT NULL, | ||
| 90 | `email` varchar(254) NOT NULL, | ||
| 91 | PRIMARY KEY (`useruuid`) | ||
| 92 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | ||
| 93 | commit; \ No newline at end of file | ||