From 49b4408782ddb598fbbc105665b2af4080c33a50 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 20 Jan 2018 12:11:07 +0000
Subject: some cleanup

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 12 +++++++-----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     |  1 -
 OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs        |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region')

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
             if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting)
                 allowSplitting = false;
 
-            bool packetQueued = false;
+//            bool packetQueued = false;
 
             if (allowSplitting && packet.HasVariableBlocks)
             {
@@ -911,15 +911,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < packetCount; i++)
                 {
                     byte[] data = datas[i];
-                    if (!SendPacketData(udpClient, data, packet.Type, category, method))
-                        packetQueued = true;
+//                    if (!SendPacketData(udpClient, data, packet.Type, category, method))
+//                        packetQueued = true;
+                    SendPacketData(udpClient, data, packet.Type, category, method);
                 }
             }
             else
             {
                 byte[] data = packet.ToBytes();
-                if (!SendPacketData(udpClient, data, packet.Type, category, method))
-                    packetQueued = true;
+//                if (!SendPacketData(udpClient, data, packet.Type, category, method))
+//                    packetQueued = true;
+                SendPacketData(udpClient, data, packet.Type, category, method);
             }
 
             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
     public class ScenePresence : EntityBase, IScenePresence
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static readonly String LogHeader = "[SCENE PRESENCE]";
 
 //        ~ScenePresence()
 //        {
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
     using dReal = System.Single;
 //#endif
 
+    [SuppressUnmanagedCodeSecurityAttribute]
     internal static class SafeNativeMethods
     {
         internal static dReal Infinity = dReal.MaxValue;
-- 
cgit v1.1