diff options
| author | Melanie | 2013-07-24 03:50:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 03:50:09 +0100 |
| commit | a7eb1b5b855b3caa6c4622789ef1377830e2f435 (patch) | |
| tree | 2bd58bcd2bd9b37adeb746f4b399b1d98539d1cf /OpenSim/Data/SQLite/Resources | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.zip opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.gz opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.bz2 opensim-SC-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Data/SQLite/Resources')
| -rw-r--r-- | OpenSim/Data/SQLite/Resources/HGTravelStore.migrations | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations index 2e73caa..02612ce 100644 --- a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations +++ b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | :VERSION 1 # -------------------------- | 1 | :VERSION 2 # -------------------------- |
| 2 | 2 | ||
| 3 | BEGIN; | 3 | BEGIN; |
| 4 | 4 | ||
| 5 | CREATE TABLE hg_traveling_data ( | 5 | CREATE TABLE hg_traveling_data( |
| 6 | SessionID VARCHAR(36) NOT NULL, | 6 | SessionID VARCHAR(36) NOT NULL, |
| 7 | UserID VARCHAR(36) NOT NULL, | 7 | UserID VARCHAR(36) NOT NULL, |
| 8 | GridExternalName VARCHAR(255) NOT NULL DEFAULT '', | 8 | GridExternalName VARCHAR(255) NOT NULL DEFAULT "", |
| 9 | ServiceToken VARCHAR(255) NOT NULL DEFAULT '', | 9 | ServiceToken VARCHAR(255) NOT NULL DEFAULT "", |
| 10 | ClientIPAddress VARCHAR(16) NOT NULL DEFAULT '', | 10 | ClientIPAddress VARCHAR(16) NOT NULL DEFAULT "", |
| 11 | MyIPAddress VARCHAR(16) NOT NULL DEFAULT '', | 11 | MyIPAddress VARCHAR(16) NOT NULL DEFAULT "", |
| 12 | TMStamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | 12 | TMStamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, |
| 13 | PRIMARY KEY (`SessionID`), | 13 | PRIMARY KEY(SessionID), |
| 14 | KEY (`UserID`) | 14 | UNIQUE(UserID) |
| 15 | ) ENGINE=InnoDB; | 15 | ); |
| 16 | 16 | ||
| 17 | COMMIT; | 17 | COMMIT; |
| 18 | 18 | ||