Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 18 insertions, 0 deletions

diff --git a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..02612ce
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
@@ -0,0 +1,18 @@
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE hg_traveling_data(
+    SessionID VARCHAR(36) NOT NULL,
+    UserID VARCHAR(36) NOT NULL,
+    GridExternalName VARCHAR(255) NOT NULL DEFAULT "",
+    ServiceToken VARCHAR(255) NOT NULL DEFAULT "",
+    ClientIPAddress VARCHAR(16) NOT NULL DEFAULT "",
+    MyIPAddress VARCHAR(16) NOT NULL DEFAULT "",
+    TMStamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY(SessionID),
+    UNIQUE(UserID)
+);
+
+COMMIT;
+