diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 18602f7..3461971 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5080,10 +5080,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5080 | update.TextureEntry = Utils.EmptyBytes; | 5080 | update.TextureEntry = Utils.EmptyBytes; |
5081 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; | 5081 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; |
5082 | 5082 | ||
5083 | /* all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854) | ||
5083 | update.UpdateFlags = (uint)( | 5084 | update.UpdateFlags = (uint)( |
5084 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | | 5085 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | |
5085 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | | 5086 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | |
5086 | PrimFlags.ObjectOwnerModify); | 5087 | PrimFlags.ObjectOwnerModify); |
5088 | */ | ||
5089 | update.UpdateFlags = 0; | ||
5087 | 5090 | ||
5088 | return update; | 5091 | return update; |
5089 | } | 5092 | } |
@@ -6404,6 +6407,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6404 | { | 6407 | { |
6405 | handlerCompleteMovementToRegion(sender, true); | 6408 | handlerCompleteMovementToRegion(sender, true); |
6406 | } | 6409 | } |
6410 | else | ||
6411 | m_log.Debug("HandleCompleteAgentMovement NULL handler"); | ||
6412 | |||
6407 | handlerCompleteMovementToRegion = null; | 6413 | handlerCompleteMovementToRegion = null; |
6408 | 6414 | ||
6409 | return true; | 6415 | return true; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index e55e2c5..754d9d2 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -779,14 +779,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
779 | IClientAPI client; | 779 | IClientAPI client; |
780 | if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) | 780 | if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) |
781 | { | 781 | { |
782 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | 782 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); |
783 | return; | 783 | return; |
784 | } | 784 | } |
785 | 785 | ||
786 | udpClient = ((LLClientView)client).UDPClient; | 786 | udpClient = ((LLClientView)client).UDPClient; |
787 | 787 | ||
788 | if (!udpClient.IsConnected) | 788 | if (!udpClient.IsConnected) |
789 | { | ||
790 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); | ||
789 | return; | 791 | return; |
792 | } | ||
790 | 793 | ||
791 | #endregion Packet to Client Mapping | 794 | #endregion Packet to Client Mapping |
792 | 795 | ||