Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 17 insertions, 0 deletions

diff --git a/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..adf126d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,17 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE hg_traveling_data (
+    "SessionID" VARCHAR(36) NOT NULL Primary Key,
+    "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 NOT NULL default now()
+);
+
+
+COMMIT;
+