From 5663e2c0c82756268c5a6aa767e6ca765c00e71d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 27 Mar 2019 07:32:06 +0000
Subject: try another way

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 +++-
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs  | 3 ++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6b70922..d21452f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12700,6 +12700,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
         {
+            /*
             UseCircuitCodePacket uccp = (UseCircuitCodePacket)Pack;
             if(uccp.CircuitCode.ID == m_agentId &&
                 uccp.CircuitCode.SessionID == m_sessionId &&
@@ -12708,8 +12709,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                !((ScenePresence)SceneAgent).IsDeleted
             )
                 SendRegionHandshake(); // possible someone returning
-
+            */
             return true;
+
         }
 
         private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 6032681..b105d52 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1725,7 +1725,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     if (client != null)
                     {
-                        client.SendRegionHandshake();
+                        if(aCircuit.teleportFlags <= 0)
+                            client.SendRegionHandshake();
                         client.CheckViewerCaps();
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 63eb29f..2145fcd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2179,6 +2179,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 // Tell the client that we're totally ready
+                ControllingClient.SendRegionHandshake();
                 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
                 //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
-- 
cgit v1.1