diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index b575ed9..72b6116 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -898,7 +898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
898 | if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting) | 898 | if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting) |
899 | allowSplitting = false; | 899 | allowSplitting = false; |
900 | 900 | ||
901 | bool packetQueued = false; | 901 | // bool packetQueued = false; |
902 | 902 | ||
903 | if (allowSplitting && packet.HasVariableBlocks) | 903 | if (allowSplitting && packet.HasVariableBlocks) |
904 | { | 904 | { |
@@ -911,15 +911,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
911 | for (int i = 0; i < packetCount; i++) | 911 | for (int i = 0; i < packetCount; i++) |
912 | { | 912 | { |
913 | byte[] data = datas[i]; | 913 | byte[] data = datas[i]; |
914 | if (!SendPacketData(udpClient, data, packet.Type, category, method)) | 914 | // if (!SendPacketData(udpClient, data, packet.Type, category, method)) |
915 | packetQueued = true; | 915 | // packetQueued = true; |
916 | SendPacketData(udpClient, data, packet.Type, category, method); | ||
916 | } | 917 | } |
917 | } | 918 | } |
918 | else | 919 | else |
919 | { | 920 | { |
920 | byte[] data = packet.ToBytes(); | 921 | byte[] data = packet.ToBytes(); |
921 | if (!SendPacketData(udpClient, data, packet.Type, category, method)) | 922 | // if (!SendPacketData(udpClient, data, packet.Type, category, method)) |
922 | packetQueued = true; | 923 | // packetQueued = true; |
924 | SendPacketData(udpClient, data, packet.Type, category, method); | ||
923 | } | 925 | } |
924 | 926 | ||
925 | PacketPool.Instance.ReturnPacket(packet); | 927 | PacketPool.Instance.ReturnPacket(packet); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e10e787..ec09fe6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
77 | public class ScenePresence : EntityBase, IScenePresence | 77 | public class ScenePresence : EntityBase, IScenePresence |
78 | { | 78 | { |
79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
80 | private static readonly String LogHeader = "[SCENE PRESENCE]"; | ||
81 | 80 | ||
82 | // ~ScenePresence() | 81 | // ~ScenePresence() |
83 | // { | 82 | // { |
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs index 47e7c7b..42ad391 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs | |||
@@ -54,6 +54,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
54 | using dReal = System.Single; | 54 | using dReal = System.Single; |
55 | //#endif | 55 | //#endif |
56 | 56 | ||
57 | [SuppressUnmanagedCodeSecurityAttribute] | ||
57 | internal static class SafeNativeMethods | 58 | internal static class SafeNativeMethods |
58 | { | 59 | { |
59 | internal static dReal Infinity = dReal.MaxValue; | 60 | internal static dReal Infinity = dReal.MaxValue; |