ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2011-04-30 14:37:37 +01:00
parent 57efed988c 4d5d6222f7
commit d1cf1fe3d7
99 changed files with 658 additions and 4238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -4910,7 +4910,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
data.RelativePosition.ToBytes(objectData, 0);
data.Velocity.ToBytes(objectData, 12);
data.Acceleration.ToBytes(objectData, 24);
data.RotationOffset.ToBytes(objectData, 36);
try
{
data.RotationOffset.ToBytes(objectData, 36);
}
catch (Exception e)
{
m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString());
OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36);
}
data.AngularVelocity.ToBytes(objectData, 48);
ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -11719,7 +11727,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
info.userEP = m_userEndPoint;
info.proxyEP = null;
info.agentcircuit = new sAgentCircuitData(RequestClientInfo());
info.agentcircuit = RequestClientInfo();
return info;
}

2
OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
View File

@@ -184,7 +184,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Create a token bucket throttle for this client that has the scene token bucket as a parent
m_throttleClient = new AdaptiveTokenBucket(parentThrottle, rates.Total, rates.AdaptiveThrottlesEnabled);
// Create a token bucket throttle for the total categary with the client bucket as a throttle
m_throttleCategory = new TokenBucket(m_throttleClient, rates.Total);
m_throttleCategory = new TokenBucket(m_throttleClient, 0);
// Create an array of token buckets for this clients different throttle categories
m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];

2
OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
View File

@@ -365,7 +365,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_enabled)
{
m_log.WarnFormat("[TOKENBUCKET] Adaptive throttle enabled");
// m_log.DebugFormat("[TOKENBUCKET] Adaptive throttle enabled");
MaxDripRate = maxDripRate;
AdjustedDripRate = m_minimumFlow;
}