aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2007-12-09 14:47:18 +0000
committerSean Dague2007-12-09 14:47:18 +0000
commitcace0e055cf0bc574d412563371973aeb9c3d54a (patch)
tree616cd6e537ee283ac49b55862a7e71d86059330e
parent* Added some inter-region comms glue for allowing sims to chat amongst themse... (diff)
downloadopensim-SC-cace0e055cf0bc574d412563371973aeb9c3d54a.zip
opensim-SC-cace0e055cf0bc574d412563371973aeb9c3d54a.tar.gz
opensim-SC-cace0e055cf0bc574d412563371973aeb9c3d54a.tar.bz2
opensim-SC-cace0e055cf0bc574d412563371973aeb9c3d54a.tar.xz
change PacketQueue to take the byte[] throttle instead
of the Packet to set the throttles
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs3
-rw-r--r--OpenSim/Region/ClientStack/PacketQueue.cs5
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index d71feb0..3fb21e3 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3107,7 +3107,8 @@ namespace OpenSim.Region.ClientStack
3107 break; 3107 break;
3108 3108
3109 case PacketType.AgentThrottle: 3109 case PacketType.AgentThrottle:
3110 PacketQueue.SetThrottleFromClient(Pack); 3110 AgentThrottlePacket atpack = (AgentThrottlePacket)Pack;
3111 PacketQueue.SetThrottleFromClient(atpack.Throttle.Throttles);
3111 break; 3112 break;
3112 3113
3113 #endregion 3114 #endregion
diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs
index 5deede5..ca878bb 100644
--- a/OpenSim/Region/ClientStack/PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/PacketQueue.cs
@@ -330,11 +330,8 @@ namespace OpenSim.Region.ClientStack
330 return (int)(((float)value/(float)curmax) * newmax); 330 return (int)(((float)value/(float)curmax) * newmax);
331 } 331 }
332 332
333 public void SetThrottleFromClient(Packet Pack) 333 public void SetThrottleFromClient(byte[] throttle)
334 { 334 {
335 AgentThrottlePacket atpack = (AgentThrottlePacket)Pack;
336
337 byte[] throttle = atpack.Throttle.Throttles;
338 int tResend = -1; 335 int tResend = -1;
339 int tLand = -1; 336 int tLand = -1;
340 int tWind = -1; 337 int tWind = -1;