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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2022-10-29 01:20:37 +01:00
parent fb9eade129
commit ec793ae7d3
3 changed files with 181 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

321
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

File diff suppressed because it is too large Load Diff

31
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@@ -511,7 +511,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
rate = (float)m_throttleCategories[(int)ThrottleOutPacketType.Asset].RequestedDripRate * multiplier;
Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); i += 4;
Buffer.BlockCopy(Utils.FloatToBytes(rate), 0, data, i, 4); //i += 4;
m_packedThrottles = data;
}
@@ -577,7 +577,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
// if (m_deliverPackets == false) return false;
OutgoingPacket packet = null;
OutgoingPacket packet;
DoubleLocklessQueue<OutgoingPacket> queue;
bool packetSent = false;
ThrottleOutPacketTypeFlags emptyCategories = 0;
@@ -765,7 +765,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
callback = null;
}
m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => act(udpcli, cats));
_ = m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => act(udpcli, cats));
}
else
Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty");
@@ -821,23 +821,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
ThrottleOutPacketType category = (ThrottleOutPacketType)i;
switch (category)
return category switch
{
case ThrottleOutPacketType.Land:
return ThrottleOutPacketTypeFlags.Land; // Terrain data
case ThrottleOutPacketType.Wind:
return ThrottleOutPacketTypeFlags.Wind; // Wind data
case ThrottleOutPacketType.Cloud:
return ThrottleOutPacketTypeFlags.Cloud; // Cloud data
case ThrottleOutPacketType.Task:
return ThrottleOutPacketTypeFlags.Task; // Object updates and everything not on the other categories
case ThrottleOutPacketType.Texture:
return ThrottleOutPacketTypeFlags.Texture; // Textures data (also impacts http texture and mesh by default)
case ThrottleOutPacketType.Asset:
return ThrottleOutPacketTypeFlags.Asset; // Non-texture Assets data
default:
return 0;
}
ThrottleOutPacketType.Land => ThrottleOutPacketTypeFlags.Land,// Terrain data
ThrottleOutPacketType.Wind => ThrottleOutPacketTypeFlags.Wind,// Wind data
ThrottleOutPacketType.Cloud => ThrottleOutPacketTypeFlags.Cloud,// Cloud data
ThrottleOutPacketType.Task => ThrottleOutPacketTypeFlags.Task,// Object updates and everything not on the other categories
ThrottleOutPacketType.Texture => ThrottleOutPacketTypeFlags.Texture,// Textures data (also impacts http texture and mesh by default)
ThrottleOutPacketType.Asset => ThrottleOutPacketTypeFlags.Asset,// Non-texture Assets data
_ => 0,
};
}
}

29
OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
View File

@@ -97,26 +97,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public int GetRate(ThrottleOutPacketType type)
{
switch (type)
return type switch
{
case ThrottleOutPacketType.Resend:
return Resend;
case ThrottleOutPacketType.Land:
return Land;
case ThrottleOutPacketType.Wind:
return Wind;
case ThrottleOutPacketType.Cloud:
return Cloud;
case ThrottleOutPacketType.Task:
return Task;
case ThrottleOutPacketType.Texture:
return Texture;
case ThrottleOutPacketType.Asset:
return Asset;
case ThrottleOutPacketType.Unknown:
default:
return 0;
}
ThrottleOutPacketType.Resend => Resend,
ThrottleOutPacketType.Land => Land,
ThrottleOutPacketType.Wind => Wind,
ThrottleOutPacketType.Cloud => Cloud,
ThrottleOutPacketType.Task => Task,
ThrottleOutPacketType.Texture => Texture,
ThrottleOutPacketType.Asset => Asset,
_ => 0,
};
}
}
}