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

scale ChildAgentThrottles with distance (internal to child server and not

Browse Source 
root as was done before )
This commit is contained in:
UbitUmarov
2014-11-06 22:25:16 +00:00
parent ead78764ab
commit caddabb5c4
7 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12344,7 +12344,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="throttles"></param>
public void SetChildAgentThrottle(byte[] throttles)
{
m_udpClient.SetThrottles(throttles);
SetChildAgentThrottle(throttles, 1.0f);
}
public void SetChildAgentThrottle(byte[] throttles,float factor)
{
m_udpClient.SetThrottles(throttles, factor);
GenericCall2 handler = OnUpdateThrottles;
if (handler != null)
{

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

@@ -339,6 +339,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
public void SetThrottles(byte[] throttleData)
{
SetThrottles(throttleData, 1.0f);
}
public void SetThrottles(byte[] throttleData, float factor)
{
byte[] adjData;
int pos = 0;
@@ -359,13 +364,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
// 0.125f converts from bits to bytes
int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
float scale = 0.125f * factor;
int resend = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int land = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int wind = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int cloud = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int task = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int texture = (int)(BitConverter.ToSingle(adjData, pos) * scale); pos += 4;
int asset = (int)(BitConverter.ToSingle(adjData, pos) * scale);
// Make sure none of the throttles are set below our packet MTU,
// otherwise a throttle could become permanently clogged