Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 30 insertions, 27 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs b/OpenSim/Data/MySQL/MySQLMuteListData.cs
index c6f531e..a5935a3 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs
+++ b/OpenSim/Data/MySQL/MySQLMuteListData.cs
@@ -26,39 +26,42 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenSim.Region.Framework.Scenes;
-using System.IO;
+using System.Data;
 using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
 
-namespace OpenSim.Region.Framework.Interfaces
+namespace OpenSim.Data.MySQL
 {
-    public interface IRegionCombinerModule
+    public class MySqlMuteListData : MySQLGenericTableHandler<MuteData>, IMuteListData
     {
-        /// <summary>
-        /// Does the given id belong to the root region of a megaregion?
-        /// </summary>
-        bool IsRootForMegaregion(UUID regionId);
+        public MySqlMuteListData(string connectionString)
+                : base(connectionString, "MuteList", "MuteListStore")
+        {
+        }
 
-        /// <summary>
-        /// Gets the size of megaregion.
-        /// </summary>
-        /// <remarks>
-        /// Returns size in meters.
-        /// Do not rely on this method remaining the same - this area is actively under development.
-        /// </remarks>
-        /// <param name="sceneId">
-        /// The id of the root region for a megaregion.
-        /// This may change in the future to allow any region id that makes up a megaregion.
-        /// Currently, will throw an exception if this does not match a root region.
-        /// </param>
-        Vector2 GetSizeOfMegaregion(UUID regionId);
+        public MuteData[] Get(UUID agentID)
+        {
+            MuteData[] data = base.Get("AgentID", agentID.ToString());
+            return data;
+        }
 
-        /// <summary>
-        /// Tests to see of position (relative to the region) is within the megaregion
-        /// </summary>
-        bool PositionIsInMegaregion(UUID currentRegion, int xx, int yy);
+        public bool Delete(UUID agentID, UUID muteID, string muteName)
+        {
+            string cmnd ="delete from MuteList where AgentID = ?AgentID and MuteID = ?MuteID and MuteName = ?MuteName";
+
+            using (MySqlCommand cmd = new MySqlCommand(cmnd))
+            {
+                cmd.Parameters.AddWithValue("?AgentID", agentID.ToString());
+                cmd.Parameters.AddWithValue("?MuteID", muteID.ToString());
+                cmd.Parameters.AddWithValue("?MuteName", muteName);
+
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+                return false;
+            }
+        }
     }
 }
\ No newline at end of file