From b5b01e5bb59656078012c12146ea6f9e71589d43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 28 Mar 2013 01:37:52 +0000
Subject: Make HGLureModule track god like lures as well as normal lures, to
 see if this fixes issues where second megaregion auto-teleport hangs on black
 teleport screen when HG is active.

---
 OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Lure')

diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 6c9fd86..a34f2d2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -154,7 +154,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         void OnIncomingInstantMessage(GridInstantMessage im)
         {
-            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport)
+            if (im.dialog == (byte)InstantMessageDialog.RequestTeleport 
+                || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport)
             {
                 UUID sessionID = new UUID(im.imSessionID);
 
-- 
cgit v1.1


From b05ed4ffa693f3481f97a197de7e582492dc7271 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 28 Mar 2013 02:17:32 +0000
Subject: Instead of going via GodLikeRequestTeleport, auto-teleport the agent
 directly in a megaregion, in the same manner at the "teleport user" console
 command.

This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
---
 OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Lure')

diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index e4b0cfa..7f4606b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     (uint)presence.AbsolutePosition.Y,
                     (uint)Math.Ceiling(presence.AbsolutePosition.Z));
 
-            m_log.DebugFormat("TP invite with message {0}", message);
+            m_log.DebugFormat("TP invite with message {0}, type {1}", message, lureType);
 
             GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
                     client.FirstName+" "+client.LastName, targetid,
-- 
cgit v1.1