1 files changed, 70 insertions, 71 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/RemoteMuteListServiceConnector.cs
index 6617bbc..a5dec64 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MuteList/RemoteMuteListServiceConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,121 +24,120 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Drawing;
-using System.Drawing.Imaging;
+using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
-using System.Web;
-using log4net;
-using Nini.Config;
-using Mono.Addins;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenMetaverse.Imaging;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Capabilities.Handlers;
+using OpenSim.Services.Connectors;
 
-namespace OpenSim.Region.ClientStack.Linden
-{
+using OpenMetaverse;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
 
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetDisplayNamesModule")]
-    public class GetDisplayNamesModule : INonSharedRegionModule
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MuteList
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteMuteListServicesConnector")]
+    public class RemoteMuteListServicesConnector : ISharedRegionModule, IMuteListService
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private Scene m_scene;
-        private IUserManagement m_UserManager;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        #region ISharedRegionModule
 
         private bool m_Enabled = false;
 
-        private string m_URL;
+        private IMuteListService m_remoteConnector;
 
-        #region ISharedRegionModule Members
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public string Name
+        {
+            get { return "RemoteMuteListServicesConnector"; }
+        }
 
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-            if (config == null)
+           // only active for core mute lists module
+            IConfig moduleConfig = source.Configs["Messaging"];
+            if (moduleConfig == null)
                 return;
 
-            m_URL = config.GetString("Cap_GetDisplayNames", string.Empty);
-            if (m_URL != string.Empty)
-                m_Enabled = true;
+            if (moduleConfig.GetString("MuteListModule", "None") != "MuteListModuleTst")
+                return;
+            
+            moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("MuteListService", "");
+                if (name == Name)
+                {
+                    m_remoteConnector = new MuteListServicesConnector(source);
+                    m_Enabled = true;
+                }
+            }
         }
 
-        public void AddRegion(Scene s)
+        public void PostInitialise()
         {
-            if (!m_Enabled)
-                return;
+        }
 
-            m_scene = s;
+        public void Close()
+        {
         }
 
-        public void RemoveRegion(Scene s)
+        public void AddRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
 
-            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
-            m_scene = null;
+            scene.RegisterModuleInterface<IMuteListService>(this);
+            m_log.InfoFormat("[MUTELIST CONNECTOR]: Enabled for region {0}", scene.RegionInfo.RegionName);
         }
 
-        public void RegionLoaded(Scene s)
+        public void RemoveRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
-            m_UserManager = m_scene.RequestModuleInterface<IUserManagement>();
-            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
         }
 
-        public void Close() { }
-
-        public string Name { get { return "GetDisplayNamesModule"; } }
+        #endregion
 
-        public Type ReplaceableInterface
+        #region IMuteListService
+        public Byte[] MuteListRequest(UUID agentID, uint crc)
         {
-            get { return null; }
+            if (!m_Enabled)
+                return null;
+            return m_remoteConnector.MuteListRequest(agentID, crc);
         }
 
-        #endregion
-
-        public void RegisterCaps(UUID agentID, Caps caps)
+        public bool UpdateMute(MuteData mute)
         {
-            UUID capID = UUID.Random();
+            if (!m_Enabled)
+                return false;
+            return m_remoteConnector.UpdateMute(mute);
+        }
 
-            if (m_URL == "localhost")
-            {
-                m_log.DebugFormat("[GET_DISPLAY_NAMES]: /CAPS/agents/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler(
-                    "GetDisplayNames",
-                    new GetDisplayNamesHandler("/CAPS/agents" + capID + "/", m_UserManager, "GetDisplayNames", agentID.ToString()));
-            }
-            else
-            {
-//                m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
-                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
-                if (handler != null)
-                    handler.RegisterExternalUserCapsHandler(agentID,caps,"GetDisplayNames", m_URL);
-                else
-                    caps.RegisterHandler("GetDisplayNames", m_URL);
-            }
+        public bool RemoveMute(UUID agentID, UUID muteID, string muteName)
+        {
+            if (!m_Enabled)
+                return false;
+            return m_remoteConnector.RemoveMute(agentID, muteID, muteName);
         }
 
+        #endregion IMuteListService
+
     }
 }