aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs251
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs66
5 files changed, 192 insertions, 140 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index e9e2dca..9dd6663 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -202,6 +202,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
202 m_stopPacket = TexturePacketCount(); 202 m_stopPacket = TexturePacketCount();
203 } 203 }
204 204
205 //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
206 if (m_stopPacket == 1 && Layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
207
205 m_currentPacket = StartPacket; 208 m_currentPacket = StartPacket;
206 } 209 }
207 } 210 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7851c4d..5419ede 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -155,6 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
155 public event RequestTaskInventory OnRequestTaskInventory; 155 public event RequestTaskInventory OnRequestTaskInventory;
156 public event UpdateInventoryItem OnUpdateInventoryItem; 156 public event UpdateInventoryItem OnUpdateInventoryItem;
157 public event CopyInventoryItem OnCopyInventoryItem; 157 public event CopyInventoryItem OnCopyInventoryItem;
158 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
158 public event MoveInventoryItem OnMoveInventoryItem; 159 public event MoveInventoryItem OnMoveInventoryItem;
159 public event RemoveInventoryItem OnRemoveInventoryItem; 160 public event RemoveInventoryItem OnRemoveInventoryItem;
160 public event RemoveInventoryFolder OnRemoveInventoryFolder; 161 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -335,6 +336,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
335// protected HashSet<uint> m_attachmentsSent; 336// protected HashSet<uint> m_attachmentsSent;
336 337
337 private int m_moneyBalance; 338 private int m_moneyBalance;
339 private bool m_deliverPackets = true;
338 private int m_animationSequenceNumber = 1; 340 private int m_animationSequenceNumber = 1;
339 private bool m_SendLogoutPacketWhenClosing = true; 341 private bool m_SendLogoutPacketWhenClosing = true;
340 private AgentUpdateArgs lastarg; 342 private AgentUpdateArgs lastarg;
@@ -377,6 +379,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
377 get { return m_startpos; } 379 get { return m_startpos; }
378 set { m_startpos = value; } 380 set { m_startpos = value; }
379 } 381 }
382 public bool DeliverPackets
383 {
384 get { return m_deliverPackets; }
385 set {
386 m_deliverPackets = value;
387 m_udpClient.m_deliverPackets = value;
388 }
389 }
380 public UUID AgentId { get { return m_agentId; } } 390 public UUID AgentId { get { return m_agentId; } }
381 public UUID ActiveGroupId { get { return m_activeGroupID; } } 391 public UUID ActiveGroupId { get { return m_activeGroupID; } }
382 public string ActiveGroupName { get { return m_activeGroupName; } } 392 public string ActiveGroupName { get { return m_activeGroupName; } }
@@ -475,18 +485,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
475 485
476 #region Client Methods 486 #region Client Methods
477 487
488
478 /// <summary> 489 /// <summary>
479 /// Shut down the client view 490 /// Shut down the client view
480 /// </summary> 491 /// </summary>
481 public void Close() 492 public void Close()
482 { 493 {
494 Close(true);
495 }
496
497 /// <summary>
498 /// Shut down the client view
499 /// </summary>
500 public void Close(bool sendStop)
501 {
483 m_log.DebugFormat( 502 m_log.DebugFormat(
484 "[CLIENT]: Close has been called for {0} attached to scene {1}", 503 "[CLIENT]: Close has been called for {0} attached to scene {1}",
485 Name, m_scene.RegionInfo.RegionName); 504 Name, m_scene.RegionInfo.RegionName);
486 505
487 // Send the STOP packet 506 if (sendStop)
488 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 507 {
489 OutPacket(disable, ThrottleOutPacketType.Unknown); 508 // Send the STOP packet
509 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
510 OutPacket(disable, ThrottleOutPacketType.Unknown);
511 }
490 512
491 IsActive = false; 513 IsActive = false;
492 514
@@ -767,7 +789,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
767 reply.ChatData.OwnerID = fromAgentID; 789 reply.ChatData.OwnerID = fromAgentID;
768 reply.ChatData.SourceID = fromAgentID; 790 reply.ChatData.SourceID = fromAgentID;
769 791
770 OutPacket(reply, ThrottleOutPacketType.Task); 792 OutPacket(reply, ThrottleOutPacketType.Unknown);
771 } 793 }
772 794
773 /// <summary> 795 /// <summary>
@@ -1053,6 +1075,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1053 public virtual void SendLayerData(float[] map) 1075 public virtual void SendLayerData(float[] map)
1054 { 1076 {
1055 Util.FireAndForget(DoSendLayerData, map); 1077 Util.FireAndForget(DoSendLayerData, map);
1078
1079 // Send it sync, and async. It's not that much data
1080 // and it improves user experience just so much!
1081 DoSendLayerData(map);
1056 } 1082 }
1057 1083
1058 /// <summary> 1084 /// <summary>
@@ -1065,16 +1091,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1065 1091
1066 try 1092 try
1067 { 1093 {
1068 //for (int y = 0; y < 16; y++) 1094 for (int y = 0; y < 16; y++)
1069 //{ 1095 {
1070 // for (int x = 0; x < 16; x++) 1096 for (int x = 0; x < 16; x+=4)
1071 // { 1097 {
1072 // SendLayerData(x, y, map); 1098 SendLayerPacket(x, y, map);
1073 // } 1099 }
1074 //} 1100 }
1075
1076 // Send LayerData in a spiral pattern. Fun!
1077 SendLayerTopRight(map, 0, 0, 15, 15);
1078 } 1101 }
1079 catch (Exception e) 1102 catch (Exception e)
1080 { 1103 {
@@ -1082,51 +1105,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1082 } 1105 }
1083 } 1106 }
1084 1107
1085 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1086 {
1087 // Row
1088 for (int i = x1; i <= x2; i++)
1089 SendLayerData(i, y1, map);
1090
1091 // Column
1092 for (int j = y1 + 1; j <= y2; j++)
1093 SendLayerData(x2, j, map);
1094
1095 if (x2 - x1 > 0)
1096 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1097 }
1098
1099 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1100 {
1101 // Row in reverse
1102 for (int i = x2; i >= x1; i--)
1103 SendLayerData(i, y2, map);
1104
1105 // Column in reverse
1106 for (int j = y2 - 1; j >= y1; j--)
1107 SendLayerData(x1, j, map);
1108
1109 if (x2 - x1 > 0)
1110 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1111 }
1112
1113 /// <summary> 1108 /// <summary>
1114 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1109 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1115 /// </summary> 1110 /// </summary>
1116 /// <param name="map">heightmap</param> 1111 /// <param name="map">heightmap</param>
1117 /// <param name="px">X coordinate for patches 0..12</param> 1112 /// <param name="px">X coordinate for patches 0..12</param>
1118 /// <param name="py">Y coordinate for patches 0..15</param> 1113 /// <param name="py">Y coordinate for patches 0..15</param>
1119 // private void SendLayerPacket(float[] map, int y, int x) 1114 private void SendLayerPacket(int x, int y, float[] map)
1120 // { 1115 {
1121 // int[] patches = new int[4]; 1116 int[] patches = new int[4];
1122 // patches[0] = x + 0 + y * 16; 1117 patches[0] = x + 0 + y * 16;
1123 // patches[1] = x + 1 + y * 16; 1118 patches[1] = x + 1 + y * 16;
1124 // patches[2] = x + 2 + y * 16; 1119 patches[2] = x + 2 + y * 16;
1125 // patches[3] = x + 3 + y * 16; 1120 patches[3] = x + 3 + y * 16;
1126 1121
1127 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1122 float[] heightmap = (map.Length == 65536) ?
1128 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1123 map :
1129 // } 1124 LLHeightFieldMoronize(map);
1125
1126 try
1127 {
1128 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1129 OutPacket(layerpack, ThrottleOutPacketType.Land);
1130 }
1131 catch
1132 {
1133 for (int px = x ; px < x + 4 ; px++)
1134 SendLayerData(px, y, map);
1135 }
1136 }
1130 1137
1131 /// <summary> 1138 /// <summary>
1132 /// Sends a specified patch to a client 1139 /// Sends a specified patch to a client
@@ -1146,7 +1153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1146 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1153 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1147 layerpack.Header.Reliable = true; 1154 layerpack.Header.Reliable = true;
1148 1155
1149 OutPacket(layerpack, ThrottleOutPacketType.Land); 1156 OutPacket(layerpack, ThrottleOutPacketType.Task);
1150 } 1157 }
1151 catch (Exception e) 1158 catch (Exception e)
1152 { 1159 {
@@ -1507,35 +1514,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1507 OutPacket(pc, ThrottleOutPacketType.Unknown); 1514 OutPacket(pc, ThrottleOutPacketType.Unknown);
1508 } 1515 }
1509 1516
1510 public void SendKillObject(ulong regionHandle, uint localID) 1517 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1511 { 1518 {
1512// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1519// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
1513 1520
1514 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1521 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1515 // TODO: don't create new blocks if recycling an old packet 1522 // TODO: don't create new blocks if recycling an old packet
1516 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; 1523 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count];
1517 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); 1524 for (int i = 0 ; i < localIDs.Count ; i++ )
1518 kill.ObjectData[0].ID = localID; 1525 {
1526 kill.ObjectData[i] = new KillObjectPacket.ObjectDataBlock();
1527 kill.ObjectData[i].ID = localIDs[i];
1528 }
1519 kill.Header.Reliable = true; 1529 kill.Header.Reliable = true;
1520 kill.Header.Zerocoded = true; 1530 kill.Header.Zerocoded = true;
1521 1531
1522 if (m_scene.GetScenePresence(localID) == null) 1532 if (localIDs.Count == 1)
1523 { 1533 {
1524 lock (m_entityUpdates.SyncRoot) 1534 if (m_scene.GetScenePresence(localIDs[0]) != null)
1525 { 1535 {
1526 m_killRecord.Add(localID); 1536 OutPacket(kill, ThrottleOutPacketType.State);
1527 1537 return;
1528 // The throttle queue used here must match that being used for updates. Otherwise, there is a
1529 // chance that a kill packet put on a separate queue will be sent to the client before an existing
1530 // update packet on another queue. Receiving updates after kills results in unowned and undeletable
1531 // scene objects in a viewer until that viewer is relogged in.
1532 OutPacket(kill, ThrottleOutPacketType.Task);
1533 } 1538 }
1539 m_killRecord.Add(localIDs[0]);
1534 } 1540 }
1535 else 1541 else
1536 { 1542 {
1537 OutPacket(kill, ThrottleOutPacketType.State); 1543 lock (m_entityUpdates.SyncRoot)
1544 {
1545 foreach (uint localID in localIDs)
1546 m_killRecord.Add(localID);
1547 }
1538 } 1548 }
1549
1550 // The throttle queue used here must match that being used for
1551 // updates. Otherwise, there is a chance that a kill packet put
1552 // on a separate queue will be sent to the client before an
1553 // existing update packet on another queue. Receiving updates
1554 // after kills results in unowned and undeletable
1555 // scene objects in a viewer until that viewer is relogged in.
1556 OutPacket(kill, ThrottleOutPacketType.Task);
1539 } 1557 }
1540 1558
1541 /// <summary> 1559 /// <summary>
@@ -2241,6 +2259,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2241 OutPacket(sound, ThrottleOutPacketType.Task); 2259 OutPacket(sound, ThrottleOutPacketType.Task);
2242 } 2260 }
2243 2261
2262 public void SendTransferAbort(TransferRequestPacket transferRequest)
2263 {
2264 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2265 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2266 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2267 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2268 OutPacket(abort, ThrottleOutPacketType.Task);
2269 }
2270
2244 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2271 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2245 { 2272 {
2246 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2273 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -3542,6 +3569,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3542 /// </summary> 3569 /// </summary>
3543 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3570 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3544 { 3571 {
3572 if (entity is SceneObjectPart)
3573 {
3574 SceneObjectPart e = (SceneObjectPart)entity;
3575 SceneObjectGroup g = e.ParentGroup;
3576 if (g.RootPart.Shape.State > 30) // HUD
3577 if (g.OwnerID != AgentId)
3578 return; // Don't send updates for other people's HUDs
3579 }
3580
3545 double priority = m_prioritizer.GetUpdatePriority(this, entity); 3581 double priority = m_prioritizer.GetUpdatePriority(this, entity);
3546 3582
3547 lock (m_entityUpdates.SyncRoot) 3583 lock (m_entityUpdates.SyncRoot)
@@ -3562,23 +3598,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3562 EntityUpdate update; 3598 EntityUpdate update;
3563 while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update)) 3599 while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update))
3564 { 3600 {
3565 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client 3601 // If we have sent a kill packet for this object
3566 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good 3602 // drop any updates on the floor
3567 // safety measure.
3568 //
3569 // Receiving updates after kills results in undeleteable prims that persist until relog and
3570 // currently occurs because prims can be deleted before all queued updates are sent.
3571 if (m_killRecord.Contains(update.Entity.LocalId))
3572 {
3573// m_log.WarnFormat(
3574// "[CLIENT]: Preventing full update for prim with local id {0} after client for user {1} told it was deleted",
3575// update.Entity.LocalId, Name);
3576 continue;
3577 }
3578
3579 if (update.Entity is SceneObjectPart) 3603 if (update.Entity is SceneObjectPart)
3580 { 3604 {
3581 SceneObjectPart part = (SceneObjectPart)update.Entity; 3605 SceneObjectPart part = (SceneObjectPart)update.Entity;
3606 if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3607 continue;
3582 3608
3583 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3609 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3584 { 3610 {
@@ -4012,6 +4038,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4012 { 4038 {
4013 m_propertiesPacketTimer.Stop(); 4039 m_propertiesPacketTimer.Stop();
4014 4040
4041 if (m_propertiesBlocks.Count == 0)
4042 return;
4043
4015 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count]; 4044 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count];
4016 4045
4017 int index = 0; 4046 int index = 0;
@@ -4918,6 +4947,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4918 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 4947 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
4919 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 4948 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
4920 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 4949 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
4950 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
4921 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 4951 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
4922 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 4952 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
4923 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 4953 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5017,6 +5047,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5017 (x.CameraLeftAxis != lastarg.CameraLeftAxis) || 5047 (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
5018 (x.CameraUpAxis != lastarg.CameraUpAxis) || 5048 (x.CameraUpAxis != lastarg.CameraUpAxis) ||
5019 (x.ControlFlags != lastarg.ControlFlags) || 5049 (x.ControlFlags != lastarg.ControlFlags) ||
5050 (x.ControlFlags != 0) ||
5020 (x.Far != lastarg.Far) || 5051 (x.Far != lastarg.Far) ||
5021 (x.Flags != lastarg.Flags) || 5052 (x.Flags != lastarg.Flags) ||
5022 (x.State != lastarg.State) || 5053 (x.State != lastarg.State) ||
@@ -5390,7 +5421,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5390 args.Channel = ch; 5421 args.Channel = ch;
5391 args.From = String.Empty; 5422 args.From = String.Empty;
5392 args.Message = Utils.BytesToString(msg); 5423 args.Message = Utils.BytesToString(msg);
5393 args.Type = ChatTypeEnum.Shout; 5424 args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance
5394 args.Position = new Vector3(); 5425 args.Position = new Vector3();
5395 args.Scene = Scene; 5426 args.Scene = Scene;
5396 args.Sender = this; 5427 args.Sender = this;
@@ -9430,6 +9461,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9430 { 9461 {
9431 return true; 9462 return true;
9432 } 9463 }
9464
9465 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
9466 {
9467 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
9468
9469 #region Packet Session and User Check
9470 if (m_checkPackets)
9471 {
9472 if (packet.AgentData.SessionID != SessionId ||
9473 packet.AgentData.AgentID != AgentId)
9474 return true;
9475 }
9476 #endregion
9477 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
9478 List<InventoryItemBase> items = new List<InventoryItemBase>();
9479 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
9480 {
9481 InventoryItemBase b = new InventoryItemBase();
9482 b.ID = n.OldItemID;
9483 b.Folder = n.OldFolderID;
9484 items.Add(b);
9485 }
9486
9487 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
9488 if (handlerMoveItemsAndLeaveCopy != null)
9489 {
9490 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
9491 }
9492
9493 return true;
9494 }
9433 9495
9434 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 9496 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9435 { 9497 {
@@ -10927,7 +10989,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10927 { 10989 {
10928 // It's a ghost! tell the client to delete it from view. 10990 // It's a ghost! tell the client to delete it from view.
10929 simClient.SendKillObject(Scene.RegionInfo.RegionHandle, 10991 simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
10930 localId); 10992 new List<uint>() { localId });
10931 } 10993 }
10932 else 10994 else
10933 { 10995 {
@@ -11297,22 +11359,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11297 /// <param name="Pack">OpenMetaverse.packet</param> 11359 /// <param name="Pack">OpenMetaverse.packet</param>
11298 public void ProcessInPacket(Packet packet) 11360 public void ProcessInPacket(Packet packet)
11299 { 11361 {
11300 if (m_debugPacketLevel > 0) 11362 if (m_debugPacketLevel >= 255)
11301 { 11363 m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type);
11302 bool outputPacket = true;
11303
11304 if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate)
11305 outputPacket = false;
11306
11307 if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage)
11308 outputPacket = false;
11309
11310 if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
11311 outputPacket = false;
11312
11313 if (outputPacket)
11314 m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type);
11315 }
11316 11364
11317 if (!ProcessPacketMethod(packet)) 11365 if (!ProcessPacketMethod(packet))
11318 m_log.Warn("[CLIENT]: unhandled packet " + packet.Type); 11366 m_log.Warn("[CLIENT]: unhandled packet " + packet.Type);
@@ -11554,7 +11602,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11554 11602
11555// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); 11603// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
11556 11604
11605
11606 //Note, the bool returned from the below function is useless since it is always false.
11557 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 11607 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
11608
11558 } 11609 }
11559 11610
11560 /// <summary> 11611 /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index c4db5da..ed0e60d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -149,6 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
149 149
150 private int m_defaultRTO = 3000; 150 private int m_defaultRTO = 3000;
151 private int m_maxRTO = 60000; 151 private int m_maxRTO = 60000;
152 public bool m_deliverPackets = true;
152 153
153 /// <summary> 154 /// <summary>
154 /// Default constructor 155 /// Default constructor
@@ -406,6 +407,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
406 if (category >= 0 && category < m_packetOutboxes.Length) 407 if (category >= 0 && category < m_packetOutboxes.Length)
407 { 408 {
408 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 409 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
410
411 if (m_deliverPackets == false)
412 {
413 queue.Enqueue(packet);
414 return true;
415 }
416
409 TokenBucket bucket = m_throttleCategories[category]; 417 TokenBucket bucket = m_throttleCategories[category];
410 418
411 if (bucket.RemoveTokens(packet.Buffer.DataLength)) 419 if (bucket.RemoveTokens(packet.Buffer.DataLength))
@@ -442,6 +450,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 /// <returns>True if any packets were sent, otherwise false</returns> 450 /// <returns>True if any packets were sent, otherwise false</returns>
443 public bool DequeueOutgoing() 451 public bool DequeueOutgoing()
444 { 452 {
453 if (m_deliverPackets == false) return false;
454
445 OutgoingPacket packet; 455 OutgoingPacket packet;
446 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 456 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
447 TokenBucket bucket; 457 TokenBucket bucket;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index b5d8ec8..59968a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -934,7 +934,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
934 if (m_scene.TryGetClient(udpClient.AgentID, out client)) 934 if (m_scene.TryGetClient(udpClient.AgentID, out client))
935 { 935 {
936 client.IsLoggingOut = true; 936 client.IsLoggingOut = true;
937 client.Close(); 937 client.Close(false);
938 } 938 }
939 } 939 }
940 940
diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index bdbd284..91e3d20 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
133 this.parent = parent; 133 this.parent = parent;
134 MaxBurst = maxBurst; 134 MaxBurst = maxBurst;
135 DripRate = dripRate; 135 DripRate = dripRate;
136 lastDrip = Environment.TickCount & Int32.MaxValue; 136 lastDrip = Environment.TickCount;
137 } 137 }
138 138
139 /// <summary> 139 /// <summary>
@@ -144,40 +144,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
144 /// the bucket, otherwise false</returns> 144 /// the bucket, otherwise false</returns>
145 public bool RemoveTokens(int amount) 145 public bool RemoveTokens(int amount)
146 { 146 {
147 bool dummy;
148 return RemoveTokens(amount, out dummy);
149 }
150
151 /// <summary>
152 /// Remove a given number of tokens from the bucket
153 /// </summary>
154 /// <param name="amount">Number of tokens to remove from the bucket</param>
155 /// <param name="dripSucceeded">True if tokens were added to the bucket
156 /// during this call, otherwise false</param>
157 /// <returns>True if the requested number of tokens were removed from
158 /// the bucket, otherwise false</returns>
159 public bool RemoveTokens(int amount, out bool dripSucceeded)
160 {
161 if (maxBurst == 0) 147 if (maxBurst == 0)
162 { 148 {
163 dripSucceeded = true;
164 return true; 149 return true;
165 } 150 }
166 151
167 dripSucceeded = Drip(); 152 if (amount > maxBurst)
168
169 if (content - amount >= 0)
170 { 153 {
171 if (parent != null && !parent.RemoveTokens(amount)) 154 throw new Exception("amount " + amount + " exceeds maxBurst " + maxBurst);
172 return false; 155 }
173 156
174 content -= amount; 157 Drip();
175 return true; 158
159 if (content < amount)
160 {
161 return false;
176 } 162 }
177 else 163
164 if (parent != null && !parent.RemoveTokens(amount))
178 { 165 {
179 return false; 166 return false;
180 } 167 }
168
169 content -= amount;
170 return true;
181 } 171 }
182 172
183 /// <summary> 173 /// <summary>
@@ -193,25 +183,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
193 content = maxBurst; 183 content = maxBurst;
194 return true; 184 return true;
195 } 185 }
196 else
197 {
198 int now = Environment.TickCount & Int32.MaxValue;
199 int deltaMS = now - lastDrip;
200 186
201 if (deltaMS <= 0) 187 int now = Environment.TickCount;
202 { 188 int deltaMS = now - lastDrip;
203 if (deltaMS < 0) 189 lastDrip = now;
204 lastDrip = now;
205 return false;
206 }
207 190
208 int dripAmount = deltaMS * tokensPerMS; 191 if (deltaMS <= 0)
209 192 {
210 content = Math.Min(content + dripAmount, maxBurst); 193 return false;
211 lastDrip = now; 194 }
212 195
213 return true; 196 long dripAmount = (long)deltaMS * (long)tokensPerMS + (long)content;
197 if (dripAmount > maxBurst)
198 {
199 dripAmount = maxBurst;
214 } 200 }
201 content = (int)dripAmount;
202 return true;
215 } 203 }
216 } 204 }
217} 205}