HG protocol is still broken for large regions. work around it on teleport via lm

2 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 0efa7c5..c804e33 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -299,7 +299,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OnQueueEmpty = null;
             PendingAcks.Clear();
             NeedAcks.Clear();
-            m_nextPackets = null;
          }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index a9aaf12..49307f6 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -515,7 +515,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion info = Scene.GridService.GetRegionByUUID(UUID.Zero, lm.RegionID);
 
             // Local region?
-            if (info != null)
+            // HG link is broken for large regions
+            // so ignore its information so lms to large regions can work
+            if (info != null && info.RegionLocY != 0)
             {
                 Scene.RequestTeleportLocation(
                     remoteClient, info.RegionHandle, lm.Position,