aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-06-28 22:06:02 +0200
committerMelanie2012-06-28 22:06:02 +0200
commit498820a74f6b288c26e2c33981297568c0c12d08 (patch)
treec87b1c20a3e3deeee56c33719ca8abed96499bdf /OpenSim/Region/ClientStack/Linden
parentFix llRegionSayTo the right way (diff)
parent reactivate physics raycasts on llCastRay() until it's clear what is its prob... (diff)
downloadopensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.zip
opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.gz
opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.bz2
opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.xz
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs5
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5a87958..80b6f64 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6402,6 +6402,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6402 { 6402 {
6403 handlerCompleteMovementToRegion(sender, true); 6403 handlerCompleteMovementToRegion(sender, true);
6404 } 6404 }
6405 else
6406 m_log.Debug("HandleCompleteAgentMovement NULL handler");
6407
6405 handlerCompleteMovementToRegion = null; 6408 handlerCompleteMovementToRegion = null;
6406 6409
6407 return true; 6410 return true;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 75f783b..bd8273d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -710,14 +710,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
710 IClientAPI client; 710 IClientAPI client;
711 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) 711 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
712 { 712 {
713 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); 713// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
714 return; 714 return;
715 } 715 }
716 716
717 udpClient = ((LLClientView)client).UDPClient; 717 udpClient = ((LLClientView)client).UDPClient;
718 718
719 if (!udpClient.IsConnected) 719 if (!udpClient.IsConnected)
720 {
721// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
720 return; 722 return;
723 }
721 724
722 #endregion Packet to Client Mapping 725 #endregion Packet to Client Mapping
723 726