1 files changed, 21 insertions, 26 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
index 4b8fc26..5611302 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs
+++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -26,47 +26,42 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Net;
+using System.Data;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Xml.Serialization;
+using System.Threading;
 using log4net;
-using Nwc.XmlRpc;
 using OpenMetaverse;
-using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Clients;
-using OpenSim.Region.Communications.OGS1;
+using MySql.Data.MySqlClient;
 
-namespace OpenSim.Region.Communications.Hypergrid
+namespace OpenSim.Data.MySQL
 {
-    public class HGUserDataPlugin : OGS1UserDataPlugin
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLAvatarData : MySQLGenericTableHandler<AvatarBaseData>,
+            IAvatarData
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        HGUserServices m_UserServices;
-
-        public HGUserDataPlugin() 
+        public MySQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
         {
         }
 
-        public HGUserDataPlugin(CommunicationsManager commsManager, HGUserServices userServices)
+        public bool Delete(UUID principalID, string name)
         {
-            m_log.DebugFormat("[HG USER SERVICES]: {0} initialized", Name);
-            m_commsManager = commsManager;
-            m_UserServices = userServices;
-        }
+            MySqlCommand cmd = new MySqlCommand();
 
-        protected override string GetUserServerURL(UUID userID)
-        {
-            string url = string.Empty;
-            if (m_UserServices.IsForeignUser(userID, out url))
-                return url;
-            return m_commsManager.NetworkServersInfo.UserURL;
-        }
+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?Name", name);
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
 
+            return false;
+        }
     }
 }