diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 | ||||
-rwxr-xr-x | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 |
2 files changed, 5 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 | } |