aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-03-27 07:32:06 +0000
committerUbitUmarov2019-03-27 07:32:06 +0000
commit5663e2c0c82756268c5a6aa767e6ca765c00e71d (patch)
tree2c8a17d8d94b72eecff5881008decde2862d37bc /OpenSim
parenttimming issues on fast tp back to same region on new code (diff)
downloadopensim-SC-5663e2c0c82756268c5a6aa767e6ca765c00e71d.zip
opensim-SC-5663e2c0c82756268c5a6aa767e6ca765c00e71d.tar.gz
opensim-SC-5663e2c0c82756268c5a6aa767e6ca765c00e71d.tar.bz2
opensim-SC-5663e2c0c82756268c5a6aa767e6ca765c00e71d.tar.xz
try another way
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
-rwxr-xr-xOpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
3 files changed, 6 insertions, 2 deletions
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
12700 12700
12701 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) 12701 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
12702 { 12702 {
12703 /*
12703 UseCircuitCodePacket uccp = (UseCircuitCodePacket)Pack; 12704 UseCircuitCodePacket uccp = (UseCircuitCodePacket)Pack;
12704 if(uccp.CircuitCode.ID == m_agentId && 12705 if(uccp.CircuitCode.ID == m_agentId &&
12705 uccp.CircuitCode.SessionID == m_sessionId && 12706 uccp.CircuitCode.SessionID == m_sessionId &&
@@ -12708,8 +12709,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12708 !((ScenePresence)SceneAgent).IsDeleted 12709 !((ScenePresence)SceneAgent).IsDeleted
12709 ) 12710 )
12710 SendRegionHandshake(); // possible someone returning 12711 SendRegionHandshake(); // possible someone returning
12711 12712 */
12712 return true; 12713 return true;
12714
12713 } 12715 }
12714 12716
12715 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack) 12717 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
1725 1725
1726 if (client != null) 1726 if (client != null)
1727 { 1727 {
1728 client.SendRegionHandshake(); 1728 if(aCircuit.teleportFlags <= 0)
1729 client.SendRegionHandshake();
1729 client.CheckViewerCaps(); 1730 client.CheckViewerCaps();
1730 } 1731 }
1731 } 1732 }
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
2179 } 2179 }
2180 } 2180 }
2181 // Tell the client that we're totally ready 2181 // Tell the client that we're totally ready
2182 ControllingClient.SendRegionHandshake();
2182 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 2183 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
2183 //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2184 //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2184 2185