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/SQLite/Resources | |
| 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-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Data/SQLite/Resources/UserProfiles.migrations | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations index 16581f6..86434e8 100644 --- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations +++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations | |||
| @@ -88,3 +88,15 @@ CREATE TABLE IF NOT EXISTS userdata ( | |||
| 88 | 88 | ||
| 89 | commit; | 89 | commit; |
| 90 | 90 | ||
| 91 | |||
| 92 | :VERSION 3 # ------------------------------- | ||
| 93 | |||
| 94 | begin; | ||
| 95 | CREATE TABLE IF NOT EXISTS usersettings ( | ||
| 96 | useruuid char(36) NOT NULL, | ||
| 97 | imviaemail binary(1) NOT NULL, | ||
| 98 | visible binary(1) NOT NULL, | ||
| 99 | email varchar(254) NOT NULL, | ||
| 100 | PRIMARY KEY (useruuid) | ||
| 101 | ) | ||
| 102 | commit; \ No newline at end of file | ||