From b46387091470f3d1465c05625a656228ca54fd61 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 27 Oct 2014 17:27:42 -0400
Subject: Add hypergrid teleporting support to user profiles picks

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs          | 8 ++++++--
 OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index c8479f0..cab0ca8 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -397,6 +397,7 @@ namespace OpenSim.Data.MySQL
                                 UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
                                 UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
                                 pick.GlobalPos = (string)reader["posglobal"];
+                                pick.Gatekeeper = (string)reader["gatekeeper"];
                                 bool.TryParse((string)reader["toppick"], out pick.TopPick);
                                 bool.TryParse((string)reader["enabled"], out pick.Enabled);
                                 pick.Name = (string)reader["name"];
@@ -436,14 +437,16 @@ namespace OpenSim.Data.MySQL
             query += "?SimName,";
             query += "?GlobalPos,";
             query += "?SortOrder,";
-            query += "?Enabled) ";
+            query += "?Enabled,";
+            query += "?Gatekeeper)";
             query += "ON DUPLICATE KEY UPDATE ";
             query += "parceluuid=?ParcelId,";
             query += "name=?Name,";
             query += "description=?Desc,";
             query += "snapshotuuid=?SnapshotId,";
             query += "pickuuid=?PickId,";
-            query += "posglobal=?GlobalPos";
+            query += "posglobal=?GlobalPos,";
+            query += "gatekeeper=?Gatekeeper";
             
             try
             {
@@ -463,6 +466,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?Original", pick.OriginalName.ToString());
                         cmd.Parameters.AddWithValue("?SimName",pick.SimName.ToString());
                         cmd.Parameters.AddWithValue("?GlobalPos", pick.GlobalPos);
+                        cmd.Parameters.AddWithValue("?Gatekeeper",pick.Gatekeeper);
                         cmd.Parameters.AddWithValue("?SortOrder", pick.SortOrder.ToString ());
                         cmd.Parameters.AddWithValue("?Enabled", pick.Enabled.ToString());
                         
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index bd325da..87e99fa 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -90,4 +90,9 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
\ No newline at end of file
+commit;
+
+:VERSION 4         # -------------------------------
+begin;
+ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
+commit;
-- 
cgit v1.1