Merge branch 'master' into careminster-presence-refactor

4 files changed, 21 insertions, 19 deletions

diff --git a/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql b/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql
new file mode 100644
index 0000000..ce4ab96
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql
@@ -0,0 +1,17 @@
+BEGIN;
+
+CREATE TABLE `GridUser` (
+    `UserID` VARCHAR(255) NOT NULL,
+    `HomeRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `LastRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `LastPosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `LastLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `Online` CHAR(5) NOT NULL DEFAULT 'false',
+    `Login` CHAR(16) NOT NULL DEFAULT '0',
+    `Logout` CHAR(16) NOT NULL DEFAULT '0',
+    PRIMARY KEY  (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_Presence.sql b/OpenSim/Data/MySQL/Resources/001_Presence.sql
index b8abaf7..84fa057 100644
--- a/OpenSim/Data/MySQL/Resources/001_Presence.sql
+++ b/OpenSim/Data/MySQL/Resources/001_Presence.sql
@@ -4,12 +4,10 @@ CREATE TABLE `Presence` (
     `UserID` VARCHAR(255) NOT NULL,
     `RegionID` CHAR(36) NOT NULL,
     `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `Online` CHAR(5) NOT NULL DEFAULT 'false',
-    `Login` CHAR(16) NOT NULL DEFAULT '0',
-    `Logout` CHAR(16) NOT NULL DEFAULT '0',
-    `Position` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    `LookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>'
+    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
 ) ENGINE=InnoDB;
 
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Presence.sql b/OpenSim/Data/MySQL/Resources/002_Presence.sql
deleted file mode 100644
index e65f105..0000000
--- a/OpenSim/Data/MySQL/Resources/002_Presence.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN;
-
-ALTER TABLE Presence ADD COLUMN `HomeRegionID` CHAR(36) NOT NULL;
-ALTER TABLE Presence ADD COLUMN `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
-ALTER TABLE Presence ADD COLUMN `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_Presence.sql b/OpenSim/Data/MySQL/Resources/003_Presence.sql
deleted file mode 100644
index 0efefa8..0000000
--- a/OpenSim/Data/MySQL/Resources/003_Presence.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT;