ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
UbitUmarov
2018-01-20 12:11:07 +00:00
parent ccd47d0cf1
commit 49b4408782
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@@ -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);

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -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()
// {

1
OpenSim/Region/PhysicsModules/ubOde/ODEApi.cs
View File

@@ -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;