1 files changed, 71 insertions, 92 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 24286a4..3dc9bf5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -29,10 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
-using Mono.Addins;
-
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -45,13 +44,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGLureModule")]
     public class HGLureModule : ISharedRegionModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly List<Scene> m_scenes = new List<Scene>();
 
         private IMessageTransferModule m_TransferModule = null;
-        private bool m_Enabled = false;
 
         private string m_ThisGridURL;
 
@@ -61,24 +58,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
         {
             if (config.Configs["Messaging"] != null)
             {
-                if (config.Configs["Messaging"].GetString("LureModule", string.Empty) == "HGLureModule")
-                {
-                    m_Enabled = true;
-
-                    m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 
-                        new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty);
-                    // Legacy. Remove soon!
-                    m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
-                    m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name);
-                }
+                m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty);
+                // Legacy. Remove soon!
+////                m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
+                m_log.DebugFormat("[HG LURE MODULE]: {0} enabled", Name);
             }
         }
 
         public void AddRegion(Scene scene)
         {
-            if (!m_Enabled)
-                return;
-
             lock (m_scenes)
             {
                 m_scenes.Add(scene);
@@ -89,9 +77,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         public void RegionLoaded(Scene scene)
         {
-            if (!m_Enabled)
-                return;
-
             if (m_TransferModule == null)
             {
                 m_TransferModule =
@@ -99,9 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
                 if (m_TransferModule == null)
                 {
-                    m_log.Error("[LURE MODULE]: No message transfer module, lures will not work!");
-
-                    m_Enabled = false;
+                    m_log.Error("[HG LURE MODULE]: No message transfer module, lures will not work!");
                     m_scenes.Clear();
                     scene.EventManager.OnNewClient -= OnNewClient;
                     scene.EventManager.OnIncomingInstantMessage -= OnIncomingInstantMessage;
@@ -112,9 +95,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         public void RemoveRegion(Scene scene)
         {
-            if (!m_Enabled)
-                return;
-
             lock (m_scenes)
             {
                 m_scenes.Remove(scene);
@@ -154,19 +134,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         void OnIncomingInstantMessage(GridInstantMessage im)
         {
-            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport 
-                || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport)
+            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport)
             {
                 UUID sessionID = new UUID(im.imSessionID);
-
                 if (!m_PendingLures.Contains(sessionID))
                 {
                     m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", im.imSessionID, im.RegionID, im.message);
                     m_PendingLures.Add(sessionID, im, 7200); // 2 hours
                 }
-
-                // Forward. We do this, because the IM module explicitly rejects
-                // IMs of this type
+                // Forward. We do this, because the IM module explicitly rejects IMs of this type
                 if (m_TransferModule != null)
                     m_TransferModule.SendInstantMessage(im, delegate(bool success) { });
             }
@@ -179,23 +155,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
             Scene scene = (Scene)(client.Scene);
             ScenePresence presence = scene.GetScenePresence(client.AgentId);
+            ScenePresence target = scene.GetScenePresence(targetid);
+            Guid start = client.Scene.RegionInfo.RegionID.Guid;
+            UUID dest = UUID.Random();
+            byte reqType = (byte)InstantMessageDialog.RequestTeleport;
+            GridInstantMessage m;
 
-            message += "@" + m_ThisGridURL;
-
-            m_log.DebugFormat("[HG LURE MODULE]: TP invite with message {0}", message);
-
-            UUID sessionID = UUID.Random();
+            GridRegion region = scene.GridService.GetRegionByUUID(scene.RegionInfo.ScopeID, new UUID(start));
+            if (region != null)
+            {
+                if (scene.Permissions.IsAdministrator(client.AgentId) && presence.IsViewerUIGod && (!scene.Permissions.IsAdministrator(targetid)))
+                {
+                    reqType = (byte)InstantMessageDialog.GodLikeRequestTeleport;
+                    m_log.DebugFormat("[HG LURE MODULE]: TP FORCE GOD LURE with message {0}, type {1}", message, lureType);
+                }
+                else
+                    m_log.DebugFormat("[HG LURE MODULE]: TP lure with message {0}, type {1}", message, lureType);
+            }
+            else
+            {
+                m_log.DebugFormat("[HG LURE MODULE]: hypergrid TP lure with message {0}, type {1}", message, lureType);
+                message += "@" + m_ThisGridURL;
+            }
 
-            GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
-                    client.FirstName+" "+client.LastName, targetid,
-                    (byte)InstantMessageDialog.RequestTeleport, false,
-                    message, sessionID, false, presence.AbsolutePosition,
-                    new Byte[0], true);
-            m.RegionID = client.Scene.RegionInfo.RegionID.Guid;
+            m = new GridInstantMessage(scene, client.AgentId, client.FirstName+" "+client.LastName, targetid,
+                    reqType, false, message, dest, false, presence.AbsolutePosition, new Byte[0], true);
+            m.RegionID = start;
+            m_PendingLures.Add(dest, m, 7200); // 2 hours
 
-            m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message);
-            m_PendingLures.Add(sessionID, m, 7200); // 2 hours
-                    
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
@@ -208,64 +195,56 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
             if (!(client.Scene is Scene))
                 return;
 
-//            Scene scene = (Scene)(client.Scene);
-
+            Scene scene = (Scene)(client.Scene);
             GridInstantMessage im = null;
+
             if (m_PendingLures.TryGetValue(lureID, out im))
             {
+                im.Position = im.Position + new Vector3(0.5f, 0.5f, 2f);
                 m_PendingLures.Remove(lureID);
-                Lure(client, teleportFlags, im);
-            }
-            else
-                m_log.DebugFormat("[HG LURE MODULE]: pending lure {0} not found", lureID);
-
-        }
-
-        private void Lure(IClientAPI client, uint teleportflags, GridInstantMessage im)
-        {
-            Scene scene = (Scene)(client.Scene);
-            GridRegion region = scene.GridService.GetRegionByUUID(scene.RegionInfo.ScopeID, new UUID(im.RegionID));
-            if (region != null)
-                scene.RequestTeleportLocation(client, region.RegionHandle, im.Position + new Vector3(0.5f, 0.5f, 0f), Vector3.UnitX, teleportflags);
-            else // we don't have that region here. Check if it's HG
-            {
-                string[] parts = im.message.Split(new char[] { '@' });
-                if (parts.Length > 1)
+                GridRegion region = scene.GridService.GetRegionByUUID(scene.RegionInfo.ScopeID, new UUID(im.RegionID));
+                if (region != null)
+                    scene.RequestTeleportLocation(client, region.RegionHandle, im.Position, Vector3.UnitX, teleportFlags);
+                else // we don't have that region here. Check if it's HG
                 {
-                    string url = parts[parts.Length - 1]; // the last part
-                    if (url.Trim(new char[] {'/'}) != m_ThisGridURL.Trim(new char[] {'/'}))
+                    string[] parts = im.message.Split(new char[] { '@' });
+                    if (parts.Length > 1)
                     {
-                        m_log.DebugFormat("[HG LURE MODULE]: Luring agent to grid {0} region {1} position {2}", url, im.RegionID, im.Position);
-                        GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
-                        GridRegion gatekeeper = new GridRegion();
-                        gatekeeper.ServerURI = url;
-                        string homeURI = scene.GetAgentHomeURI(client.AgentId);
-
-                        string message;
-                        GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message);
-                        if (finalDestination != null)
+                        string url = parts[parts.Length - 1]; // the last part
+                        if (url.Trim(new char[] {'/'}) != m_ThisGridURL.Trim(new char[] {'/'}))
                         {
-                            ScenePresence sp = scene.GetScenePresence(client.AgentId);
-                            IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
-
-                            if (transferMod != null && sp != null)
+                            m_log.DebugFormat("[HG LURE MODULE]: Luring agent to remote grid {0} region {1} position {2}", url, im.RegionID, im.Position);
+                            GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
+                            GridRegion gatekeeper = new GridRegion();
+                            gatekeeper.ServerURI = url;
+                            string homeURI = scene.GetAgentHomeURI(client.AgentId);
+
+                            string message;
+                            GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message);
+                            if (finalDestination != null)
                             {
-                                if (message != null)
-                                    sp.ControllingClient.SendAgentAlertMessage(message, true);
+                                ScenePresence sp = scene.GetScenePresence(client.AgentId);
+                                IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
+
+                                if (transferMod != null && sp != null)
+                                {
+                                    if (message != null)
+                                        sp.ControllingClient.SendAgentAlertMessage(message, true);
 
-                                transferMod.DoTeleport(
-                                    sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f),
-                                    Vector3.UnitX, teleportflags);
+                                    transferMod.DoTeleport(sp, gatekeeper, finalDestination, im.Position, Vector3.UnitX, teleportFlags);
+                                }
+                            }
+                            else
+                            {
+                                m_log.InfoFormat("[HG LURE MODULE]: Lure failed: {0}", message);
+                                client.SendAgentAlertMessage(message, true);
                             }
-                        }
-                        else
-                        {
-                            m_log.InfoFormat("[HG LURE MODULE]: Lure failed: {0}", message);
-                            client.SendAgentAlertMessage(message, true);
                         }
                     }
                 }
             }
+            else
+                m_log.DebugFormat("[HG LURE MODULE]: pending lure {0} not found", lureID);
         }
     }
-}
\ No newline at end of file
+}