aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1440
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs115
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs121
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs4
5 files changed, 1071 insertions, 612 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index afbe56b..3995620 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -234,6 +234,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
234 m_stopPacket = TexturePacketCount(); 234 m_stopPacket = TexturePacketCount();
235 } 235 }
236 236
237 //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
238 if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
239
237 m_currentPacket = StartPacket; 240 m_currentPacket = StartPacket;
238 } 241 }
239 } 242 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bd4a2d1..f1fe6e1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
99 public event AvatarPickerRequest OnAvatarPickerRequest; 99 public event AvatarPickerRequest OnAvatarPickerRequest;
100 public event StartAnim OnStartAnim; 100 public event StartAnim OnStartAnim;
101 public event StopAnim OnStopAnim; 101 public event StopAnim OnStopAnim;
102 public event ChangeAnim OnChangeAnim;
102 public event Action<IClientAPI> OnRequestAvatarsData; 103 public event Action<IClientAPI> OnRequestAvatarsData;
103 public event LinkObjects OnLinkObjects; 104 public event LinkObjects OnLinkObjects;
104 public event DelinkObjects OnDelinkObjects; 105 public event DelinkObjects OnDelinkObjects;
@@ -126,6 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
126 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 127 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
127 public event UpdatePrimFlags OnUpdatePrimFlags; 128 public event UpdatePrimFlags OnUpdatePrimFlags;
128 public event UpdatePrimTexture OnUpdatePrimTexture; 129 public event UpdatePrimTexture OnUpdatePrimTexture;
130 public event ClientChangeObject onClientChangeObject;
129 public event UpdateVector OnUpdatePrimGroupPosition; 131 public event UpdateVector OnUpdatePrimGroupPosition;
130 public event UpdateVector OnUpdatePrimSinglePosition; 132 public event UpdateVector OnUpdatePrimSinglePosition;
131 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 133 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -159,6 +161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
159 public event RequestTaskInventory OnRequestTaskInventory; 161 public event RequestTaskInventory OnRequestTaskInventory;
160 public event UpdateInventoryItem OnUpdateInventoryItem; 162 public event UpdateInventoryItem OnUpdateInventoryItem;
161 public event CopyInventoryItem OnCopyInventoryItem; 163 public event CopyInventoryItem OnCopyInventoryItem;
164 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
162 public event MoveInventoryItem OnMoveInventoryItem; 165 public event MoveInventoryItem OnMoveInventoryItem;
163 public event RemoveInventoryItem OnRemoveInventoryItem; 166 public event RemoveInventoryItem OnRemoveInventoryItem;
164 public event RemoveInventoryFolder OnRemoveInventoryFolder; 167 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -257,7 +260,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
257 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 260 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
258 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 261 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
259 public event ClassifiedDelete OnClassifiedDelete; 262 public event ClassifiedDelete OnClassifiedDelete;
260 public event ClassifiedDelete OnClassifiedGodDelete; 263 public event ClassifiedGodDelete OnClassifiedGodDelete;
261 public event EventNotificationAddRequest OnEventNotificationAddRequest; 264 public event EventNotificationAddRequest OnEventNotificationAddRequest;
262 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 265 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
263 public event EventGodDelete OnEventGodDelete; 266 public event EventGodDelete OnEventGodDelete;
@@ -288,10 +291,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
288 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 291 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
289 public event SimWideDeletesDelegate OnSimWideDeletes; 292 public event SimWideDeletesDelegate OnSimWideDeletes;
290 public event SendPostcard OnSendPostcard; 293 public event SendPostcard OnSendPostcard;
294 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
291 public event MuteListEntryUpdate OnUpdateMuteListEntry; 295 public event MuteListEntryUpdate OnUpdateMuteListEntry;
292 public event MuteListEntryRemove OnRemoveMuteListEntry; 296 public event MuteListEntryRemove OnRemoveMuteListEntry;
293 public event GodlikeMessage onGodlikeMessage; 297 public event GodlikeMessage onGodlikeMessage;
294 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 298 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
299 public event GenericCall2 OnUpdateThrottles;
295 300
296 #endregion Events 301 #endregion Events
297 302
@@ -326,6 +331,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
326 private Prioritizer m_prioritizer; 331 private Prioritizer m_prioritizer;
327 private bool m_disableFacelights = false; 332 private bool m_disableFacelights = false;
328 333
334 private bool m_VelocityInterpolate = false;
335 private const uint MaxTransferBytesPerPacket = 600;
336
337
329 /// <value> 338 /// <value>
330 /// List used in construction of data blocks for an object update packet. This is to stop us having to 339 /// List used in construction of data blocks for an object update packet. This is to stop us having to
331 /// continually recreate it. 340 /// continually recreate it.
@@ -337,14 +346,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
337 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an 346 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an
338 /// ownerless phantom. 347 /// ownerless phantom.
339 /// 348 ///
340 /// All manipulation of this set has to occur under a lock 349 /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
341 /// 350 ///
342 /// </value> 351 /// </value>
343 protected HashSet<uint> m_killRecord; 352// protected HashSet<uint> m_killRecord;
344 353
345// protected HashSet<uint> m_attachmentsSent; 354// protected HashSet<uint> m_attachmentsSent;
346 355
347 private int m_moneyBalance; 356 private int m_moneyBalance;
357 private bool m_deliverPackets = true;
348 private int m_animationSequenceNumber = 1; 358 private int m_animationSequenceNumber = 1;
349 private bool m_SendLogoutPacketWhenClosing = true; 359 private bool m_SendLogoutPacketWhenClosing = true;
350 360
@@ -391,6 +401,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
391 get { return m_startpos; } 401 get { return m_startpos; }
392 set { m_startpos = value; } 402 set { m_startpos = value; }
393 } 403 }
404 public bool DeliverPackets
405 {
406 get { return m_deliverPackets; }
407 set {
408 m_deliverPackets = value;
409 m_udpClient.m_deliverPackets = value;
410 }
411 }
394 public UUID AgentId { get { return m_agentId; } } 412 public UUID AgentId { get { return m_agentId; } }
395 public ISceneAgent SceneAgent { get; set; } 413 public ISceneAgent SceneAgent { get; set; }
396 public UUID ActiveGroupId { get { return m_activeGroupID; } } 414 public UUID ActiveGroupId { get { return m_activeGroupID; } }
@@ -442,6 +460,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 } 460 }
443 461
444 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } 462 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
463
445 464
446 #endregion Properties 465 #endregion Properties
447 466
@@ -468,7 +487,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
468 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); 487 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
469 m_entityProps = new PriorityQueue(m_scene.Entities.Count); 488 m_entityProps = new PriorityQueue(m_scene.Entities.Count);
470 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); 489 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
471 m_killRecord = new HashSet<uint>(); 490// m_killRecord = new HashSet<uint>();
472// m_attachmentsSent = new HashSet<uint>(); 491// m_attachmentsSent = new HashSet<uint>();
473 492
474 m_assetService = m_scene.RequestModuleInterface<IAssetService>(); 493 m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -498,12 +517,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
498 517
499 #region Client Methods 518 #region Client Methods
500 519
520
521 /// <summary>
522 /// Close down the client view
523 /// </summary>
501 public void Close() 524 public void Close()
502 { 525 {
503 Close(false); 526 Close(true, false);
504 } 527 }
505 528
506 public void Close(bool force) 529 public void Close(bool sendStop, bool force)
507 { 530 {
508 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. 531 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
509 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. 532 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
@@ -515,7 +538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
515 return; 538 return;
516 539
517 IsActive = false; 540 IsActive = false;
518 CloseWithoutChecks(); 541 CloseWithoutChecks(sendStop);
519 } 542 }
520 } 543 }
521 544
@@ -528,12 +551,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
528 /// 551 ///
529 /// Callers must lock ClosingSyncLock before calling. 552 /// Callers must lock ClosingSyncLock before calling.
530 /// </remarks> 553 /// </remarks>
531 public void CloseWithoutChecks() 554 public void CloseWithoutChecks(bool sendStop)
532 { 555 {
533 m_log.DebugFormat( 556 m_log.DebugFormat(
534 "[CLIENT]: Close has been called for {0} attached to scene {1}", 557 "[CLIENT]: Close has been called for {0} attached to scene {1}",
535 Name, m_scene.RegionInfo.RegionName); 558 Name, m_scene.RegionInfo.RegionName);
536 559
560 if (sendStop)
561 {
562 // Send the STOP packet
563 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
564 OutPacket(disable, ThrottleOutPacketType.Unknown);
565 }
566
537 // Shutdown the image manager 567 // Shutdown the image manager
538 ImageManager.Close(); 568 ImageManager.Close();
539 569
@@ -556,6 +586,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
556 // Disable UDP handling for this client 586 // Disable UDP handling for this client
557 m_udpClient.Shutdown(); 587 m_udpClient.Shutdown();
558 588
589
559 //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 590 //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false));
560 //GC.Collect(); 591 //GC.Collect();
561 //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); 592 //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -791,7 +822,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
791 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); 822 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
792 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; 823 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
793 824
794 OutPacket(handshake, ThrottleOutPacketType.Task); 825// OutPacket(handshake, ThrottleOutPacketType.Task);
826 // use same as MoveAgentIntoRegion (both should be task )
827 OutPacket(handshake, ThrottleOutPacketType.Unknown);
795 } 828 }
796 829
797 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) 830 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
@@ -831,7 +864,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
831 reply.ChatData.OwnerID = ownerID; 864 reply.ChatData.OwnerID = ownerID;
832 reply.ChatData.SourceID = fromAgentID; 865 reply.ChatData.SourceID = fromAgentID;
833 866
834 OutPacket(reply, ThrottleOutPacketType.Task); 867 OutPacket(reply, ThrottleOutPacketType.Unknown);
835 } 868 }
836 869
837 /// <summary> 870 /// <summary>
@@ -864,32 +897,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
864 msg.MessageBlock.Message = Util.StringToBytes1024(im.message); 897 msg.MessageBlock.Message = Util.StringToBytes1024(im.message);
865 msg.MessageBlock.BinaryBucket = im.binaryBucket; 898 msg.MessageBlock.BinaryBucket = im.binaryBucket;
866 899
867 if (im.message.StartsWith("[grouptest]")) 900 OutPacket(msg, ThrottleOutPacketType.Task);
868 { // this block is test code for implementing group IM - delete when group IM is finished
869 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
870 if (eq != null)
871 {
872 im.dialog = 17;
873
874 //eq.ChatterboxInvitation(
875 // new UUID("00000000-68f9-1111-024e-222222111123"),
876 // "OpenSimulator Testing", im.fromAgentID, im.message, im.toAgentID, im.fromAgentName, im.dialog, 0,
877 // false, 0, new Vector3(), 1, im.imSessionID, im.fromGroup, im.binaryBucket);
878
879 eq.ChatterboxInvitation(
880 new UUID("00000000-68f9-1111-024e-222222111123"),
881 "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0,
882 false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing"));
883
884 eq.ChatterBoxSessionAgentListUpdates(
885 new UUID("00000000-68f9-1111-024e-222222111123"),
886 new UUID(im.fromAgentID), new UUID(im.toAgentID), false, false, false);
887 }
888
889 Console.WriteLine("SendInstantMessage: " + msg);
890 }
891 else
892 OutPacket(msg, ThrottleOutPacketType.Task);
893 } 901 }
894 } 902 }
895 903
@@ -1117,6 +1125,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1117 public virtual void SendLayerData(float[] map) 1125 public virtual void SendLayerData(float[] map)
1118 { 1126 {
1119 Util.FireAndForget(DoSendLayerData, map); 1127 Util.FireAndForget(DoSendLayerData, map);
1128
1129 // Send it sync, and async. It's not that much data
1130 // and it improves user experience just so much!
1131 DoSendLayerData(map);
1120 } 1132 }
1121 1133
1122 /// <summary> 1134 /// <summary>
@@ -1129,16 +1141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1129 1141
1130 try 1142 try
1131 { 1143 {
1132 //for (int y = 0; y < 16; y++) 1144 for (int y = 0; y < 16; y++)
1133 //{ 1145 {
1134 // for (int x = 0; x < 16; x++) 1146 for (int x = 0; x < 16; x+=4)
1135 // { 1147 {
1136 // SendLayerData(x, y, map); 1148 SendLayerPacket(x, y, map);
1137 // } 1149 }
1138 //} 1150 }
1139
1140 // Send LayerData in a spiral pattern. Fun!
1141 SendLayerTopRight(map, 0, 0, 15, 15);
1142 } 1151 }
1143 catch (Exception e) 1152 catch (Exception e)
1144 { 1153 {
@@ -1146,51 +1155,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1146 } 1155 }
1147 } 1156 }
1148 1157
1149 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1150 {
1151 // Row
1152 for (int i = x1; i <= x2; i++)
1153 SendLayerData(i, y1, map);
1154
1155 // Column
1156 for (int j = y1 + 1; j <= y2; j++)
1157 SendLayerData(x2, j, map);
1158
1159 if (x2 - x1 > 0)
1160 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1161 }
1162
1163 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1164 {
1165 // Row in reverse
1166 for (int i = x2; i >= x1; i--)
1167 SendLayerData(i, y2, map);
1168
1169 // Column in reverse
1170 for (int j = y2 - 1; j >= y1; j--)
1171 SendLayerData(x1, j, map);
1172
1173 if (x2 - x1 > 0)
1174 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1175 }
1176
1177 /// <summary> 1158 /// <summary>
1178 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1159 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1179 /// </summary> 1160 /// </summary>
1180 /// <param name="map">heightmap</param> 1161 /// <param name="map">heightmap</param>
1181 /// <param name="px">X coordinate for patches 0..12</param> 1162 /// <param name="px">X coordinate for patches 0..12</param>
1182 /// <param name="py">Y coordinate for patches 0..15</param> 1163 /// <param name="py">Y coordinate for patches 0..15</param>
1183 // private void SendLayerPacket(float[] map, int y, int x) 1164 private void SendLayerPacket(int x, int y, float[] map)
1184 // { 1165 {
1185 // int[] patches = new int[4]; 1166 int[] patches = new int[4];
1186 // patches[0] = x + 0 + y * 16; 1167 patches[0] = x + 0 + y * 16;
1187 // patches[1] = x + 1 + y * 16; 1168 patches[1] = x + 1 + y * 16;
1188 // patches[2] = x + 2 + y * 16; 1169 patches[2] = x + 2 + y * 16;
1189 // patches[3] = x + 3 + y * 16; 1170 patches[3] = x + 3 + y * 16;
1190 1171
1191 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1172 float[] heightmap = (map.Length == 65536) ?
1192 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1173 map :
1193 // } 1174 LLHeightFieldMoronize(map);
1175
1176 try
1177 {
1178 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1179 OutPacket(layerpack, ThrottleOutPacketType.Land);
1180 }
1181 catch
1182 {
1183 for (int px = x ; px < x + 4 ; px++)
1184 SendLayerData(px, y, map);
1185 }
1186 }
1194 1187
1195 /// <summary> 1188 /// <summary>
1196 /// Sends a specified patch to a client 1189 /// Sends a specified patch to a client
@@ -1210,7 +1203,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1210 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1203 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1211 layerpack.Header.Reliable = true; 1204 layerpack.Header.Reliable = true;
1212 1205
1213 OutPacket(layerpack, ThrottleOutPacketType.Land); 1206 OutPacket(layerpack, ThrottleOutPacketType.Task);
1214 } 1207 }
1215 catch (Exception e) 1208 catch (Exception e)
1216 { 1209 {
@@ -1573,7 +1566,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1573 1566
1574 public void SendKillObject(ulong regionHandle, List<uint> localIDs) 1567 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1575 { 1568 {
1576// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1569// foreach (uint id in localIDs)
1570// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1577 1571
1578 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1572 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1579 // TODO: don't create new blocks if recycling an old packet 1573 // TODO: don't create new blocks if recycling an old packet
@@ -1595,17 +1589,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1595 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race 1589 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
1596 // condition where a kill can be processed before an out-of-date update for the same object. 1590 // condition where a kill can be processed before an out-of-date update for the same object.
1597 // ProcessEntityUpdates() also takes the m_killRecord lock. 1591 // ProcessEntityUpdates() also takes the m_killRecord lock.
1598 lock (m_killRecord) 1592// lock (m_killRecord)
1599 { 1593// {
1600 foreach (uint localID in localIDs) 1594// foreach (uint localID in localIDs)
1601 m_killRecord.Add(localID); 1595// m_killRecord.Add(localID);
1602 1596
1603 // The throttle queue used here must match that being used for updates. Otherwise, there is a 1597 // The throttle queue used here must match that being used for updates. Otherwise, there is a
1604 // chance that a kill packet put on a separate queue will be sent to the client before an existing 1598 // chance that a kill packet put on a separate queue will be sent to the client before an existing
1605 // update packet on another queue. Receiving updates after kills results in unowned and undeletable 1599 // update packet on another queue. Receiving updates after kills results in unowned and undeletable
1606 // scene objects in a viewer until that viewer is relogged in. 1600 // scene objects in a viewer until that viewer is relogged in.
1607 OutPacket(kill, ThrottleOutPacketType.Task); 1601 OutPacket(kill, ThrottleOutPacketType.Task);
1608 } 1602// }
1609 } 1603 }
1610 } 1604 }
1611 1605
@@ -2063,9 +2057,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2063 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 2057 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
2064 } 2058 }
2065 2059
2066 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
2067 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) 2060 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
2068 { 2061 {
2062 SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
2063 }
2064
2065 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
2066 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
2067 {
2069 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; 2068 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
2070 2069
2071 UpdateCreateInventoryItemPacket InventoryReply 2070 UpdateCreateInventoryItemPacket InventoryReply
@@ -2075,6 +2074,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2075 // TODO: don't create new blocks if recycling an old packet 2074 // TODO: don't create new blocks if recycling an old packet
2076 InventoryReply.AgentData.AgentID = AgentId; 2075 InventoryReply.AgentData.AgentID = AgentId;
2077 InventoryReply.AgentData.SimApproved = true; 2076 InventoryReply.AgentData.SimApproved = true;
2077 InventoryReply.AgentData.TransactionID = transactionID;
2078 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; 2078 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
2079 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); 2079 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
2080 InventoryReply.InventoryData[0].ItemID = Item.ID; 2080 InventoryReply.InventoryData[0].ItemID = Item.ID;
@@ -2144,16 +2144,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2144 replytask.InventoryData.TaskID = taskID; 2144 replytask.InventoryData.TaskID = taskID;
2145 replytask.InventoryData.Serial = serial; 2145 replytask.InventoryData.Serial = serial;
2146 replytask.InventoryData.Filename = fileName; 2146 replytask.InventoryData.Filename = fileName;
2147 OutPacket(replytask, ThrottleOutPacketType.Asset); 2147 OutPacket(replytask, ThrottleOutPacketType.Task);
2148 } 2148 }
2149 2149
2150 public void SendXferPacket(ulong xferID, uint packet, byte[] data) 2150 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
2151 { 2151 {
2152 ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
2153 if (isTaskInventory)
2154 type = ThrottleOutPacketType.Task;
2155
2152 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); 2156 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
2153 sendXfer.XferID.ID = xferID; 2157 sendXfer.XferID.ID = xferID;
2154 sendXfer.XferID.Packet = packet; 2158 sendXfer.XferID.Packet = packet;
2155 sendXfer.DataPacket.Data = data; 2159 sendXfer.DataPacket.Data = data;
2156 OutPacket(sendXfer, ThrottleOutPacketType.Asset); 2160 OutPacket(sendXfer, type);
2157 } 2161 }
2158 2162
2159 public void SendAbortXferPacket(ulong xferID) 2163 public void SendAbortXferPacket(ulong xferID)
@@ -2335,6 +2339,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2335 OutPacket(sound, ThrottleOutPacketType.Task); 2339 OutPacket(sound, ThrottleOutPacketType.Task);
2336 } 2340 }
2337 2341
2342 public void SendTransferAbort(TransferRequestPacket transferRequest)
2343 {
2344 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2345 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2346 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2347 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2348 OutPacket(abort, ThrottleOutPacketType.Task);
2349 }
2350
2338 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2351 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2339 { 2352 {
2340 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2353 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2643,6 +2656,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2643 float friction = part.Friction; 2656 float friction = part.Friction;
2644 float bounce = part.Restitution; 2657 float bounce = part.Restitution;
2645 float gravmod = part.GravityModifier; 2658 float gravmod = part.GravityModifier;
2659
2646 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); 2660 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
2647 } 2661 }
2648 } 2662 }
@@ -2713,8 +2727,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2713 req.AssetInf.ID, req.AssetInf.Metadata.ContentType); 2727 req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
2714 return; 2728 return;
2715 } 2729 }
2730 int WearableOut = 0;
2731 bool isWearable = false;
2732
2733 if (req.AssetInf != null)
2734 isWearable =
2735 ((AssetType) req.AssetInf.Type ==
2736 AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
2716 2737
2717 //m_log.Debug("sending asset " + req.RequestAssetID); 2738
2739 //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable);
2740
2741
2742 //if (isWearable)
2743 // m_log.Debug((AssetType)req.AssetInf.Type);
2744
2718 TransferInfoPacket Transfer = new TransferInfoPacket(); 2745 TransferInfoPacket Transfer = new TransferInfoPacket();
2719 Transfer.TransferInfo.ChannelType = 2; 2746 Transfer.TransferInfo.ChannelType = 2;
2720 Transfer.TransferInfo.Status = 0; 2747 Transfer.TransferInfo.Status = 0;
@@ -2736,7 +2763,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2736 Transfer.TransferInfo.Size = req.AssetInf.Data.Length; 2763 Transfer.TransferInfo.Size = req.AssetInf.Data.Length;
2737 Transfer.TransferInfo.TransferID = req.TransferRequestID; 2764 Transfer.TransferInfo.TransferID = req.TransferRequestID;
2738 Transfer.Header.Zerocoded = true; 2765 Transfer.Header.Zerocoded = true;
2739 OutPacket(Transfer, ThrottleOutPacketType.Asset); 2766 OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
2740 2767
2741 if (req.NumPackets == 1) 2768 if (req.NumPackets == 1)
2742 { 2769 {
@@ -2747,12 +2774,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2747 TransferPacket.TransferData.Data = req.AssetInf.Data; 2774 TransferPacket.TransferData.Data = req.AssetInf.Data;
2748 TransferPacket.TransferData.Status = 1; 2775 TransferPacket.TransferData.Status = 1;
2749 TransferPacket.Header.Zerocoded = true; 2776 TransferPacket.Header.Zerocoded = true;
2750 OutPacket(TransferPacket, ThrottleOutPacketType.Asset); 2777 OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
2751 } 2778 }
2752 else 2779 else
2753 { 2780 {
2754 int processedLength = 0; 2781 int processedLength = 0;
2755 int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; 2782// int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
2783
2784 int maxChunkSize = (int) MaxTransferBytesPerPacket;
2756 int packetNumber = 0; 2785 int packetNumber = 0;
2757 2786
2758 while (processedLength < req.AssetInf.Data.Length) 2787 while (processedLength < req.AssetInf.Data.Length)
@@ -2778,7 +2807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2778 TransferPacket.TransferData.Status = 1; 2807 TransferPacket.TransferData.Status = 1;
2779 } 2808 }
2780 TransferPacket.Header.Zerocoded = true; 2809 TransferPacket.Header.Zerocoded = true;
2781 OutPacket(TransferPacket, ThrottleOutPacketType.Asset); 2810 OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
2782 2811
2783 processedLength += chunkSize; 2812 processedLength += chunkSize;
2784 packetNumber++; 2813 packetNumber++;
@@ -2823,7 +2852,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2823 reply.Data.ParcelID = parcelID; 2852 reply.Data.ParcelID = parcelID;
2824 reply.Data.OwnerID = land.OwnerID; 2853 reply.Data.OwnerID = land.OwnerID;
2825 reply.Data.Name = Utils.StringToBytes(land.Name); 2854 reply.Data.Name = Utils.StringToBytes(land.Name);
2826 reply.Data.Desc = Utils.StringToBytes(land.Description); 2855 if (land != null && land.Description != null && land.Description != String.Empty)
2856 reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
2857 else
2858 reply.Data.Desc = new Byte[0];
2827 reply.Data.ActualArea = land.Area; 2859 reply.Data.ActualArea = land.Area;
2828 reply.Data.BillableArea = land.Area; // TODO: what is this? 2860 reply.Data.BillableArea = land.Area; // TODO: what is this?
2829 2861
@@ -3530,24 +3562,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3530 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count]; 3562 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count];
3531 AgentWearablesUpdatePacket.WearableDataBlock awb; 3563 AgentWearablesUpdatePacket.WearableDataBlock awb;
3532 int idx = 0; 3564 int idx = 0;
3533 for (int i = 0; i < wearables.Length; i++) 3565
3534 { 3566 for (int i = 0; i < wearables.Length; i++)
3535 for (int j = 0; j < wearables[i].Count; j++) 3567 {
3536 { 3568 for (int j = 0; j < wearables[i].Count; j++)
3537 awb = new AgentWearablesUpdatePacket.WearableDataBlock(); 3569 {
3538 awb.WearableType = (byte)i; 3570 awb = new AgentWearablesUpdatePacket.WearableDataBlock();
3539 awb.AssetID = wearables[i][j].AssetID; 3571 awb.WearableType = (byte) i;
3540 awb.ItemID = wearables[i][j].ItemID; 3572 awb.AssetID = wearables[i][j].AssetID;
3541 aw.WearableData[idx] = awb; 3573 awb.ItemID = wearables[i][j].ItemID;
3542 idx++; 3574 aw.WearableData[idx] = awb;
3543 3575 idx++;
3544// m_log.DebugFormat( 3576
3545// "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}", 3577 // m_log.DebugFormat(
3546// awb.ItemID, awb.AssetID, i, Name); 3578 // "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
3547 } 3579 // awb.ItemID, awb.AssetID, i, Name);
3548 } 3580 }
3581 }
3549 3582
3550 OutPacket(aw, ThrottleOutPacketType.Task); 3583 OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
3551 } 3584 }
3552 3585
3553 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) 3586 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
@@ -3558,7 +3591,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3558 3591
3559 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); 3592 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
3560 // TODO: don't create new blocks if recycling an old packet 3593 // TODO: don't create new blocks if recycling an old packet
3561 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 3594 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
3562 avp.ObjectData.TextureEntry = textureEntry; 3595 avp.ObjectData.TextureEntry = textureEntry;
3563 3596
3564 AvatarAppearancePacket.VisualParamBlock avblock = null; 3597 AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3571,7 +3604,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3571 3604
3572 avp.Sender.IsTrial = false; 3605 avp.Sender.IsTrial = false;
3573 avp.Sender.ID = agentID; 3606 avp.Sender.ID = agentID;
3574 //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); 3607 m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
3575 OutPacket(avp, ThrottleOutPacketType.Task); 3608 OutPacket(avp, ThrottleOutPacketType.Task);
3576 } 3609 }
3577 3610
@@ -3688,7 +3721,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3688 /// </summary> 3721 /// </summary>
3689 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3722 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3690 { 3723 {
3691 //double priority = m_prioritizer.GetUpdatePriority(this, entity); 3724 if (entity is SceneObjectPart)
3725 {
3726 SceneObjectPart e = (SceneObjectPart)entity;
3727 SceneObjectGroup g = e.ParentGroup;
3728 if (g.RootPart.Shape.State > 30) // HUD
3729 if (g.OwnerID != AgentId)
3730 return; // Don't send updates for other people's HUDs
3731 }
3732
3692 uint priority = m_prioritizer.GetUpdatePriority(this, entity); 3733 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3693 3734
3694 lock (m_entityUpdates.SyncRoot) 3735 lock (m_entityUpdates.SyncRoot)
@@ -3755,27 +3796,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3755 3796
3756 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race 3797 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
3757 // condition where a kill can be processed before an out-of-date update for the same object. 3798 // condition where a kill can be processed before an out-of-date update for the same object.
3758 lock (m_killRecord) 3799 float avgTimeDilation = 1.0f;
3800 IEntityUpdate iupdate;
3801 Int32 timeinqueue; // this is just debugging code & can be dropped later
3802
3803 while (updatesThisCall < maxUpdates)
3759 { 3804 {
3760 float avgTimeDilation = 1.0f; 3805 lock (m_entityUpdates.SyncRoot)
3761 IEntityUpdate iupdate; 3806 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3762 Int32 timeinqueue; // this is just debugging code & can be dropped later 3807 break;
3808
3809 EntityUpdate update = (EntityUpdate)iupdate;
3810
3811 avgTimeDilation += update.TimeDilation;
3812 avgTimeDilation *= 0.5f;
3763 3813
3764 while (updatesThisCall < maxUpdates) 3814 if (update.Entity is SceneObjectPart)
3765 { 3815 {
3766 lock (m_entityUpdates.SyncRoot) 3816 SceneObjectPart part = (SceneObjectPart)update.Entity;
3767 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3768 break;
3769 3817
3770 EntityUpdate update = (EntityUpdate)iupdate; 3818 if (part.ParentGroup.IsDeleted)
3771 3819 continue;
3772 avgTimeDilation += update.TimeDilation;
3773 avgTimeDilation *= 0.5f;
3774 3820
3775 if (update.Entity is SceneObjectPart) 3821 if (part.ParentGroup.IsAttachment)
3822 { // Someone else's HUD, why are we getting these?
3823 if (part.ParentGroup.OwnerID != AgentId &&
3824 part.ParentGroup.RootPart.Shape.State > 30)
3825 continue;
3826 ScenePresence sp;
3827 // Owner is not in the sim, don't update it to
3828 // anyone
3829 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
3830 continue;
3831
3832 List<SceneObjectGroup> atts = sp.GetAttachments();
3833 bool found = false;
3834 foreach (SceneObjectGroup att in atts)
3835 {
3836 if (att == part.ParentGroup)
3837 {
3838 found = true;
3839 break;
3840 }
3841 }
3842
3843 // It's an attachment of a valid avatar, but
3844 // doesn't seem to be attached, skip
3845 if (!found)
3846 continue;
3847
3848 // On vehicle crossing, the attachments are received
3849 // while the avatar is still a child. Don't send
3850 // updates here because the LocalId has not yet
3851 // been updated and the viewer will derender the
3852 // attachments until the avatar becomes root.
3853 if (sp.IsChildAgent)
3854 continue;
3855
3856 // If the object is an attachment we don't want it to be in the kill
3857 // record. Else attaching from inworld and subsequently dropping
3858 // it will no longer work.
3859// lock (m_killRecord)
3860// {
3861// m_killRecord.Remove(part.LocalId);
3862// m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
3863// }
3864 }
3865 else
3776 { 3866 {
3777 SceneObjectPart part = (SceneObjectPart)update.Entity;
3778
3779 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client 3867 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
3780 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good 3868 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good
3781 // safety measure. 3869 // safety measure.
@@ -3786,241 +3874,177 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3786 // 3874 //
3787 // This doesn't appear to apply to child prims - a client will happily ignore these updates 3875 // This doesn't appear to apply to child prims - a client will happily ignore these updates
3788 // after the root prim has been deleted. 3876 // after the root prim has been deleted.
3789 if (m_killRecord.Contains(part.LocalId)) 3877 //
3790 { 3878 // We ignore this for attachments because attaching something from inworld breaks unless we do.
3791 // m_log.WarnFormat( 3879// lock (m_killRecord)
3792 // "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted", 3880// {
3793 // part.LocalId, Name); 3881// if (m_killRecord.Contains(part.LocalId))
3794 continue; 3882// continue;
3795 } 3883// if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3796 3884// continue;
3797 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3885// }
3886 }
3887
3888 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3889 {
3890 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
3891 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3798 { 3892 {
3799 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && 3893 part.Shape.LightEntry = false;
3800 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3801 {
3802 part.Shape.LightEntry = false;
3803 }
3804 } 3894 }
3805 } 3895 }
3806 3896 }
3807 #region UpdateFlags to packet type conversion 3897
3808 3898 ++updatesThisCall;
3809 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags; 3899
3810 3900 #region UpdateFlags to packet type conversion
3811 bool canUseCompressed = true; 3901
3812 bool canUseImproved = true; 3902 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
3813 3903
3814 // Compressed object updates only make sense for LL primitives 3904 bool canUseCompressed = true;
3815 if (!(update.Entity is SceneObjectPart)) 3905 bool canUseImproved = true;
3906
3907 // Compressed object updates only make sense for LL primitives
3908 if (!(update.Entity is SceneObjectPart))
3909 {
3910 canUseCompressed = false;
3911 }
3912
3913 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3914 {
3915 canUseCompressed = false;
3916 canUseImproved = false;
3917 }
3918 else
3919 {
3920 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3921 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3922 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3923 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3816 { 3924 {
3817 canUseCompressed = false; 3925 canUseCompressed = false;
3818 } 3926 }
3819 3927
3820 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) 3928 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3929 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3930 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3931 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3932 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3933 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3934 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3935 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3936 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3937 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3938 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3939 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3940 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3941 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3821 { 3942 {
3822 canUseCompressed = false;
3823 canUseImproved = false; 3943 canUseImproved = false;
3824 } 3944 }
3825 else 3945 }
3826 {
3827 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3828 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3829 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3830 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3831 {
3832 canUseCompressed = false;
3833 }
3834
3835 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3836 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3837 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3838 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3839 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3840 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3841 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3842 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3843 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3844 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3845 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3846 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3847 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3848 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3849 {
3850 canUseImproved = false;
3851 }
3852 }
3853
3854 #endregion UpdateFlags to packet type conversion
3855
3856 #region Block Construction
3857
3858 // TODO: Remove this once we can build compressed updates
3859 canUseCompressed = false;
3860 3946
3861 if (!canUseImproved && !canUseCompressed) 3947 #endregion UpdateFlags to packet type conversion
3862 {
3863 ObjectUpdatePacket.ObjectDataBlock updateBlock;
3864 3948
3865 if (update.Entity is ScenePresence) 3949 #region Block Construction
3866 {
3867 updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
3868 }
3869 else
3870 {
3871 SceneObjectPart part = (SceneObjectPart)update.Entity;
3872 updateBlock = CreatePrimUpdateBlock(part, AgentId);
3873
3874 // If the part has become a private hud since the update was scheduled then we do not
3875 // want to send it to other avatars.
3876 if (part.ParentGroup.IsAttachment
3877 && part.ParentGroup.HasPrivateAttachmentPoint
3878 && part.ParentGroup.AttachedAvatar != AgentId)
3879 continue;
3880
3881 // If the part has since been deleted, then drop the update. In the case of attachments,
3882 // this is to avoid spurious updates to other viewers since post-processing of attachments
3883 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3884 // of the test above).
3885 //
3886 // Actual deletions (kills) happen in another method.
3887 if (part.ParentGroup.IsDeleted)
3888 continue;
3889 }
3890 3950
3891 objectUpdateBlocks.Value.Add(updateBlock); 3951 // TODO: Remove this once we can build compressed updates
3892 objectUpdates.Value.Add(update); 3952 canUseCompressed = false;
3893 }
3894 else if (!canUseImproved)
3895 {
3896 SceneObjectPart part = (SceneObjectPart)update.Entity;
3897 ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
3898 = CreateCompressedUpdateBlock(part, updateFlags);
3899
3900 // If the part has since been deleted, then drop the update. In the case of attachments,
3901 // this is to avoid spurious updates to other viewers since post-processing of attachments
3902 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3903 // of the test above).
3904 //
3905 // Actual deletions (kills) happen in another method.
3906 if (part.ParentGroup.IsDeleted)
3907 continue;
3908 3953
3909 compressedUpdateBlocks.Value.Add(compressedBlock); 3954 if (!canUseImproved && !canUseCompressed)
3910 compressedUpdates.Value.Add(update); 3955 {
3956 if (update.Entity is ScenePresence)
3957 {
3958 objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
3911 } 3959 }
3912 else 3960 else
3913 { 3961 {
3914 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) 3962 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
3915 {
3916 // Self updates go into a special list
3917 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3918 terseAgentUpdates.Value.Add(update);
3919 }
3920 else
3921 {
3922 ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
3923 = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
3924
3925 // Everything else goes here
3926 if (update.Entity is SceneObjectPart)
3927 {
3928 SceneObjectPart part = (SceneObjectPart)update.Entity;
3929
3930 // If the part has become a private hud since the update was scheduled then we do not
3931 // want to send it to other avatars.
3932 if (part.ParentGroup.IsAttachment
3933 && part.ParentGroup.HasPrivateAttachmentPoint
3934 && part.ParentGroup.AttachedAvatar != AgentId)
3935 continue;
3936
3937 // If the part has since been deleted, then drop the update. In the case of attachments,
3938 // this is to avoid spurious updates to other viewers since post-processing of attachments
3939 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3940 // of the test above).
3941 //
3942 // Actual deletions (kills) happen in another method.
3943 if (part.ParentGroup.IsDeleted)
3944 continue;
3945 }
3946
3947 terseUpdateBlocks.Value.Add(terseUpdateBlock);
3948 terseUpdates.Value.Add(update);
3949 }
3950 } 3963 }
3951
3952 ++updatesThisCall;
3953
3954 #endregion Block Construction
3955 } 3964 }
3956 3965 else if (!canUseImproved)
3957 #region Packet Sending 3966 {
3958 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); 3967 compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
3959 3968 }
3960 if (terseAgentUpdateBlocks.IsValueCreated) 3969 else
3961 { 3970 {
3962 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value; 3971 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
3972 // Self updates go into a special list
3973 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3974 else
3975 // Everything else goes here
3976 terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3977 }
3963 3978
3964 ImprovedTerseObjectUpdatePacket packet 3979 #endregion Block Construction
3965 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); 3980 }
3966 3981
3967 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3982 #region Packet Sending
3968 packet.RegionData.TimeDilation = timeDilation; 3983
3969 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 3984 const float TIME_DILATION = 1.0f;
3985 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
3986
3987 if (terseAgentUpdateBlocks.IsValueCreated)
3988 {
3989 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
3970 3990
3971 for (int i = 0; i < blocks.Count; i++) 3991 ImprovedTerseObjectUpdatePacket packet
3972 packet.ObjectData[i] = blocks[i]; 3992 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
3973 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 3993 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3974 OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); }); 3994 packet.RegionData.TimeDilation = timeDilation;
3975 } 3995 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3976 3996
3977 if (objectUpdateBlocks.IsValueCreated) 3997 for (int i = 0; i < blocks.Count; i++)
3978 { 3998 packet.ObjectData[i] = blocks[i];
3979 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
3980
3981 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
3982 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3983 packet.RegionData.TimeDilation = timeDilation;
3984 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3985
3986 for (int i = 0; i < blocks.Count; i++)
3987 packet.ObjectData[i] = blocks[i];
3988 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3989 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
3990 }
3991
3992 if (compressedUpdateBlocks.IsValueCreated)
3993 {
3994 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
3995
3996 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
3997 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3998 packet.RegionData.TimeDilation = timeDilation;
3999 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
4000
4001 for (int i = 0; i < blocks.Count; i++)
4002 packet.ObjectData[i] = blocks[i];
4003 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
4004 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
4005 }
4006 3999
4007 if (terseUpdateBlocks.IsValueCreated) 4000 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
4008 { 4001 }
4009 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
4010
4011 ImprovedTerseObjectUpdatePacket packet
4012 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
4013 PacketType.ImprovedTerseObjectUpdate);
4014 4002
4015 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 4003 if (objectUpdateBlocks.IsValueCreated)
4016 packet.RegionData.TimeDilation = timeDilation; 4004 {
4017 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 4005 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
4018 4006
4019 for (int i = 0; i < blocks.Count; i++) 4007 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
4020 packet.ObjectData[i] = blocks[i]; 4008 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4021 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 4009 packet.RegionData.TimeDilation = timeDilation;
4022 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); 4010 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
4023 } 4011
4012 for (int i = 0; i < blocks.Count; i++)
4013 packet.ObjectData[i] = blocks[i];
4014
4015 OutPacket(packet, ThrottleOutPacketType.Task, true);
4016 }
4017
4018 if (compressedUpdateBlocks.IsValueCreated)
4019 {
4020 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
4021
4022 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
4023 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4024 packet.RegionData.TimeDilation = timeDilation;
4025 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
4026
4027 for (int i = 0; i < blocks.Count; i++)
4028 packet.ObjectData[i] = blocks[i];
4029
4030 OutPacket(packet, ThrottleOutPacketType.Task, true);
4031 }
4032
4033 if (terseUpdateBlocks.IsValueCreated)
4034 {
4035 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
4036
4037 ImprovedTerseObjectUpdatePacket packet
4038 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
4039 PacketType.ImprovedTerseObjectUpdate);
4040 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4041 packet.RegionData.TimeDilation = timeDilation;
4042 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
4043
4044 for (int i = 0; i < blocks.Count; i++)
4045 packet.ObjectData[i] = blocks[i];
4046
4047 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
4024 } 4048 }
4025 4049
4026 #endregion Packet Sending 4050 #endregion Packet Sending
@@ -4313,11 +4337,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4313 4337
4314 // Pass in the delegate so that if this packet needs to be resent, we send the current properties 4338 // Pass in the delegate so that if this packet needs to be resent, we send the current properties
4315 // of the object rather than the properties when the packet was created 4339 // of the object rather than the properties when the packet was created
4316 OutPacket(packet, ThrottleOutPacketType.Task, true, 4340 // HACK : Remove intelligent resending until it's fixed in core
4317 delegate(OutgoingPacket oPacket) 4341 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4318 { 4342 // delegate(OutgoingPacket oPacket)
4319 ResendPropertyUpdates(updates, oPacket); 4343 // {
4320 }); 4344 // ResendPropertyUpdates(updates, oPacket);
4345 // });
4346 OutPacket(packet, ThrottleOutPacketType.Task, true);
4321 4347
4322 // pbcnt += blocks.Count; 4348 // pbcnt += blocks.Count;
4323 // ppcnt++; 4349 // ppcnt++;
@@ -4343,11 +4369,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4343 // of the object rather than the properties when the packet was created 4369 // of the object rather than the properties when the packet was created
4344 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); 4370 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
4345 updates.Add(familyUpdates.Value[i]); 4371 updates.Add(familyUpdates.Value[i]);
4346 OutPacket(packet, ThrottleOutPacketType.Task, true, 4372 // HACK : Remove intelligent resending until it's fixed in core
4347 delegate(OutgoingPacket oPacket) 4373 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4348 { 4374 // delegate(OutgoingPacket oPacket)
4349 ResendPropertyUpdates(updates, oPacket); 4375 // {
4350 }); 4376 // ResendPropertyUpdates(updates, oPacket);
4377 // });
4378 OutPacket(packet, ThrottleOutPacketType.Task, true);
4351 4379
4352 // fpcnt++; 4380 // fpcnt++;
4353 // fbcnt++; 4381 // fbcnt++;
@@ -4719,7 +4747,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4719 4747
4720 if (landData.SimwideArea > 0) 4748 if (landData.SimwideArea > 0)
4721 { 4749 {
4722 int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); 4750 int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
4751 // Never report more than sim total capacity
4752 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
4753 simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
4723 updateMessage.SimWideMaxPrims = simulatorCapacity; 4754 updateMessage.SimWideMaxPrims = simulatorCapacity;
4724 } 4755 }
4725 else 4756 else
@@ -4848,14 +4879,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4848 4879
4849 if (notifyCount > 0) 4880 if (notifyCount > 0)
4850 { 4881 {
4851 if (notifyCount > 32) 4882// if (notifyCount > 32)
4852 { 4883// {
4853 m_log.InfoFormat( 4884// m_log.InfoFormat(
4854 "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" 4885// "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}"
4855 + " - a developer might want to investigate whether this is a hard limit", 32); 4886// + " - a developer might want to investigate whether this is a hard limit", 32);
4856 4887//
4857 notifyCount = 32; 4888// notifyCount = 32;
4858 } 4889// }
4859 4890
4860 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock 4891 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
4861 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; 4892 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -4910,9 +4941,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4910 { 4941 {
4911 ScenePresence presence = (ScenePresence)entity; 4942 ScenePresence presence = (ScenePresence)entity;
4912 4943
4944 position = presence.OffsetPosition;
4945 rotation = presence.Rotation;
4946
4947 if (presence.ParentID != 0)
4948 {
4949 SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
4950 if (part != null && part != part.ParentGroup.RootPart)
4951 {
4952 position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
4953 rotation = part.RotationOffset * presence.Rotation;
4954 }
4955 }
4956
4913 attachPoint = 0; 4957 attachPoint = 0;
4914 collisionPlane = presence.CollisionPlane; 4958 collisionPlane = presence.CollisionPlane;
4915 position = presence.OffsetPosition;
4916 velocity = presence.Velocity; 4959 velocity = presence.Velocity;
4917 acceleration = Vector3.Zero; 4960 acceleration = Vector3.Zero;
4918 4961
@@ -5029,13 +5072,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5029 5072
5030 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) 5073 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
5031 { 5074 {
5075 Vector3 offsetPosition = data.OffsetPosition;
5076 Quaternion rotation = data.Rotation;
5077 uint parentID = data.ParentID;
5078
5079 if (parentID != 0)
5080 {
5081 SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
5082 if (part != null && part != part.ParentGroup.RootPart)
5083 {
5084 offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
5085 rotation = part.RotationOffset * data.Rotation;
5086 parentID = part.ParentGroup.RootPart.LocalId;
5087 }
5088 }
5089
5032 byte[] objectData = new byte[76]; 5090 byte[] objectData = new byte[76];
5033 5091
5034 data.CollisionPlane.ToBytes(objectData, 0); 5092 data.CollisionPlane.ToBytes(objectData, 0);
5035 data.OffsetPosition.ToBytes(objectData, 16); 5093 offsetPosition.ToBytes(objectData, 16);
5036// data.Velocity.ToBytes(objectData, 28); 5094// data.Velocity.ToBytes(objectData, 28);
5037// data.Acceleration.ToBytes(objectData, 40); 5095// data.Acceleration.ToBytes(objectData, 40);
5038 data.Rotation.ToBytes(objectData, 52); 5096 rotation.ToBytes(objectData, 52);
5039 //data.AngularVelocity.ToBytes(objectData, 64); 5097 //data.AngularVelocity.ToBytes(objectData, 64);
5040 5098
5041 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); 5099 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5049,14 +5107,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5049 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5107 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
5050 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5108 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
5051 update.ObjectData = objectData; 5109 update.ObjectData = objectData;
5052 update.ParentID = data.ParentID; 5110 update.ParentID = parentID;
5053 update.PathCurve = 16; 5111 update.PathCurve = 16;
5054 update.PathScaleX = 100; 5112 update.PathScaleX = 100;
5055 update.PathScaleY = 100; 5113 update.PathScaleY = 100;
5056 update.PCode = (byte)PCode.Avatar; 5114 update.PCode = (byte)PCode.Avatar;
5057 update.ProfileCurve = 1; 5115 update.ProfileCurve = 1;
5058 update.PSBlock = Utils.EmptyBytes; 5116 update.PSBlock = Utils.EmptyBytes;
5059 update.Scale = new Vector3(0.45f, 0.6f, 1.9f); 5117 update.Scale = data.Appearance.AvatarSize;
5118// update.Scale.Z -= 0.2f;
5119
5060 update.Text = Utils.EmptyBytes; 5120 update.Text = Utils.EmptyBytes;
5061 update.TextColor = new byte[4]; 5121 update.TextColor = new byte[4];
5062 5122
@@ -5067,10 +5127,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5067 update.TextureEntry = Utils.EmptyBytes; 5127 update.TextureEntry = Utils.EmptyBytes;
5068// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; 5128// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
5069 5129
5130/* all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854)
5070 update.UpdateFlags = (uint)( 5131 update.UpdateFlags = (uint)(
5071 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | 5132 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
5072 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | 5133 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
5073 PrimFlags.ObjectOwnerModify); 5134 PrimFlags.ObjectOwnerModify);
5135*/
5136 update.UpdateFlags = 0;
5074 5137
5075 return update; 5138 return update;
5076 } 5139 }
@@ -5241,8 +5304,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5241 // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs 5304 // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs
5242 // for each AgentUpdate packet. 5305 // for each AgentUpdate packet.
5243 AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false); 5306 AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false);
5244 5307
5245 AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false); 5308 AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false);
5309 AddLocalPacketHandler(PacketType.VelocityInterpolateOff, HandleVelocityInterpolateOff, false);
5310 AddLocalPacketHandler(PacketType.VelocityInterpolateOn, HandleVelocityInterpolateOn, false);
5246 AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false); 5311 AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false);
5247 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false); 5312 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false);
5248 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false); 5313 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false);
@@ -5394,6 +5459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5394 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 5459 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
5395 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 5460 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
5396 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 5461 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
5462 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
5397 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 5463 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
5398 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 5464 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
5399 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 5465 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5460,6 +5526,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5460 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); 5526 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
5461 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); 5527 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
5462 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); 5528 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
5529 AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
5463 5530
5464 AddGenericPacketHandler("autopilot", HandleAutopilot); 5531 AddGenericPacketHandler("autopilot", HandleAutopilot);
5465 } 5532 }
@@ -5498,6 +5565,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5498 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || 5565 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
5499 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || 5566 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
5500 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || 5567 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
5568 (x.ControlFlags != 0) ||
5501 (x.Far != m_lastAgentUpdateArgs.Far) || 5569 (x.Far != m_lastAgentUpdateArgs.Far) ||
5502 (x.Flags != m_lastAgentUpdateArgs.Flags) || 5570 (x.Flags != m_lastAgentUpdateArgs.Flags) ||
5503 (x.State != m_lastAgentUpdateArgs.State) || 5571 (x.State != m_lastAgentUpdateArgs.State) ||
@@ -5757,6 +5825,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5757 return true; 5825 return true;
5758 } 5826 }
5759 5827
5828 private bool HandleVelocityInterpolateOff(IClientAPI sender, Packet Pack)
5829 {
5830 VelocityInterpolateOffPacket p = (VelocityInterpolateOffPacket)Pack;
5831 if (p.AgentData.SessionID != SessionId ||
5832 p.AgentData.AgentID != AgentId)
5833 return true;
5834
5835 m_VelocityInterpolate = false;
5836 return true;
5837 }
5838
5839 private bool HandleVelocityInterpolateOn(IClientAPI sender, Packet Pack)
5840 {
5841 VelocityInterpolateOnPacket p = (VelocityInterpolateOnPacket)Pack;
5842 if (p.AgentData.SessionID != SessionId ||
5843 p.AgentData.AgentID != AgentId)
5844 return true;
5845
5846 m_VelocityInterpolate = true;
5847 return true;
5848 }
5849
5850
5760 private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack) 5851 private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack)
5761 { 5852 {
5762 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; 5853 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
@@ -6177,17 +6268,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6177 // Temporarily protect ourselves from the mantis #951 failure. 6268 // Temporarily protect ourselves from the mantis #951 failure.
6178 // However, we could do this for several other handlers where a failure isn't terminal 6269 // However, we could do this for several other handlers where a failure isn't terminal
6179 // for the client session anyway, in order to protect ourselves against bad code in plugins 6270 // for the client session anyway, in order to protect ourselves against bad code in plugins
6271 Vector3 avSize = appear.AgentData.Size;
6180 try 6272 try
6181 { 6273 {
6182 byte[] visualparams = new byte[appear.VisualParam.Length]; 6274 byte[] visualparams = new byte[appear.VisualParam.Length];
6183 for (int i = 0; i < appear.VisualParam.Length; i++) 6275 for (int i = 0; i < appear.VisualParam.Length; i++)
6184 visualparams[i] = appear.VisualParam[i].ParamValue; 6276 visualparams[i] = appear.VisualParam[i].ParamValue;
6185 6277 //var b = appear.WearableData[0];
6278
6186 Primitive.TextureEntry te = null; 6279 Primitive.TextureEntry te = null;
6187 if (appear.ObjectData.TextureEntry.Length > 1) 6280 if (appear.ObjectData.TextureEntry.Length > 1)
6188 te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); 6281 te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
6282
6283 WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
6284 for (int i=0; i<appear.WearableData.Length;i++)
6285 cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
6189 6286
6190 handlerSetAppearance(sender, te, visualparams); 6287
6288
6289 handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
6191 } 6290 }
6192 catch (Exception e) 6291 catch (Exception e)
6193 { 6292 {
@@ -6396,6 +6495,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6396 { 6495 {
6397 handlerCompleteMovementToRegion(sender, true); 6496 handlerCompleteMovementToRegion(sender, true);
6398 } 6497 }
6498 else
6499 m_log.Debug("HandleCompleteAgentMovement NULL handler");
6500
6399 handlerCompleteMovementToRegion = null; 6501 handlerCompleteMovementToRegion = null;
6400 6502
6401 return true; 6503 return true;
@@ -6413,7 +6515,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6413 return true; 6515 return true;
6414 } 6516 }
6415 #endregion 6517 #endregion
6416 6518/*
6417 StartAnim handlerStartAnim = null; 6519 StartAnim handlerStartAnim = null;
6418 StopAnim handlerStopAnim = null; 6520 StopAnim handlerStopAnim = null;
6419 6521
@@ -6437,6 +6539,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6437 } 6539 }
6438 } 6540 }
6439 return true; 6541 return true;
6542*/
6543 ChangeAnim handlerChangeAnim = null;
6544
6545 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
6546 {
6547 handlerChangeAnim = OnChangeAnim;
6548 if (handlerChangeAnim != null)
6549 {
6550 handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
6551 }
6552 }
6553
6554 handlerChangeAnim = OnChangeAnim;
6555 if (handlerChangeAnim != null)
6556 {
6557 handlerChangeAnim(UUID.Zero, false, true);
6558 }
6559
6560 return true;
6440 } 6561 }
6441 6562
6442 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) 6563 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -6662,6 +6783,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6662 #endregion 6783 #endregion
6663 6784
6664 m_udpClient.SetThrottles(atpack.Throttle.Throttles); 6785 m_udpClient.SetThrottles(atpack.Throttle.Throttles);
6786 GenericCall2 handler = OnUpdateThrottles;
6787 if (handler != null)
6788 {
6789 handler();
6790 }
6665 return true; 6791 return true;
6666 } 6792 }
6667 6793
@@ -7086,7 +7212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7086 physdata.Bounce = phsblock.Restitution; 7212 physdata.Bounce = phsblock.Restitution;
7087 physdata.Density = phsblock.Density; 7213 physdata.Density = phsblock.Density;
7088 physdata.Friction = phsblock.Friction; 7214 physdata.Friction = phsblock.Friction;
7089 physdata.GravitationModifier = phsblock.GravityMultiplier; 7215 physdata.GravitationModifier = phsblock.GravityMultiplier;
7090 } 7216 }
7091 7217
7092 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this); 7218 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
@@ -7672,6 +7798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7672 // surrounding scene 7798 // surrounding scene
7673 if ((ImageType)block.Type == ImageType.Baked) 7799 if ((ImageType)block.Type == ImageType.Baked)
7674 args.Priority *= 2.0f; 7800 args.Priority *= 2.0f;
7801 int wearableout = 0;
7675 7802
7676 ImageManager.EnqueueReq(args); 7803 ImageManager.EnqueueReq(args);
7677 } 7804 }
@@ -8690,16 +8817,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8690 8817
8691 #region Parcel related packets 8818 #region Parcel related packets
8692 8819
8820 // acumulate several HandleRegionHandleRequest consecutive overlaping requests
8821 // to be done with minimal resources as possible
8822 // variables temporary here while in test
8823
8824 Queue<UUID> RegionHandleRequests = new Queue<UUID>();
8825 bool RegionHandleRequestsInService = false;
8826
8693 private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack) 8827 private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack)
8694 { 8828 {
8695 RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack; 8829 UUID currentUUID;
8696 8830
8697 RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest; 8831 RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest;
8698 if (handlerRegionHandleRequest != null) 8832
8833 if (handlerRegionHandleRequest == null)
8834 return true;
8835
8836 RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
8837
8838 lock (RegionHandleRequests)
8699 { 8839 {
8700 handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID); 8840 if (RegionHandleRequestsInService)
8841 {
8842 // we are already busy doing a previus request
8843 // so enqueue it
8844 RegionHandleRequests.Enqueue(rhrPack.RequestBlock.RegionID);
8845 return true;
8846 }
8847
8848 // else do it
8849 currentUUID = rhrPack.RequestBlock.RegionID;
8850 RegionHandleRequestsInService = true;
8701 } 8851 }
8702 return true; 8852
8853 while (true)
8854 {
8855 handlerRegionHandleRequest(this, currentUUID);
8856
8857 lock (RegionHandleRequests)
8858 {
8859 // exit condition, nothing to do or closed
8860 // current code seems to assume we may loose the handler at anytime,
8861 // so keep checking it
8862 handlerRegionHandleRequest = OnRegionHandleRequest;
8863
8864 if (RegionHandleRequests.Count == 0 || !IsActive || handlerRegionHandleRequest == null)
8865 {
8866 RegionHandleRequests.Clear();
8867 RegionHandleRequestsInService = false;
8868 return true;
8869 }
8870 currentUUID = RegionHandleRequests.Dequeue();
8871 }
8872 }
8873
8874 return true; // actually unreached
8703 } 8875 }
8704 8876
8705 private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack) 8877 private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack)
@@ -9955,7 +10127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9955 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, 10127 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
9956 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), 10128 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
9957 UpdateMuteListEntry.MuteData.MuteType, 10129 UpdateMuteListEntry.MuteData.MuteType,
9958 UpdateMuteListEntry.AgentData.AgentID); 10130 UpdateMuteListEntry.MuteData.MuteFlags);
9959 return true; 10131 return true;
9960 } 10132 }
9961 return false; 10133 return false;
@@ -9970,8 +10142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9970 { 10142 {
9971 handlerRemoveMuteListEntry(this, 10143 handlerRemoveMuteListEntry(this,
9972 RemoveMuteListEntry.MuteData.MuteID, 10144 RemoveMuteListEntry.MuteData.MuteID,
9973 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), 10145 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
9974 RemoveMuteListEntry.AgentData.AgentID);
9975 return true; 10146 return true;
9976 } 10147 }
9977 return false; 10148 return false;
@@ -10015,10 +10186,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10015 return false; 10186 return false;
10016 } 10187 }
10017 10188
10189 private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
10190 {
10191 ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
10192 (ChangeInventoryItemFlagsPacket)packet;
10193 ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
10194 if (handlerChangeInventoryItemFlags != null)
10195 {
10196 foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
10197 handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
10198 return true;
10199 }
10200 return false;
10201 }
10202
10018 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) 10203 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
10019 { 10204 {
10020 return true; 10205 return true;
10021 } 10206 }
10207
10208 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
10209 {
10210 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
10211
10212 #region Packet Session and User Check
10213 if (m_checkPackets)
10214 {
10215 if (packet.AgentData.SessionID != SessionId ||
10216 packet.AgentData.AgentID != AgentId)
10217 return true;
10218 }
10219 #endregion
10220 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
10221 List<InventoryItemBase> items = new List<InventoryItemBase>();
10222 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
10223 {
10224 InventoryItemBase b = new InventoryItemBase();
10225 b.ID = n.OldItemID;
10226 b.Folder = n.OldFolderID;
10227 items.Add(b);
10228 }
10229
10230 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
10231 if (handlerMoveItemsAndLeaveCopy != null)
10232 {
10233 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
10234 }
10235
10236 return true;
10237 }
10022 10238
10023 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 10239 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
10024 { 10240 {
@@ -10445,6 +10661,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10445 groupProfileReply.GroupData.MaturePublish = d.MaturePublish; 10661 groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
10446 groupProfileReply.GroupData.OwnerRole = d.OwnerRole; 10662 groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
10447 10663
10664 Scene scene = (Scene)m_scene;
10665 if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
10666 {
10667 ScenePresence p;
10668 if (scene.TryGetScenePresence(sender.AgentId, out p))
10669 {
10670 if (p.GodLevel >= 200)
10671 {
10672 groupProfileReply.GroupData.OpenEnrollment = true;
10673 groupProfileReply.GroupData.MembershipFee = 0;
10674 }
10675 }
10676 }
10677
10448 OutPacket(groupProfileReply, ThrottleOutPacketType.Task); 10678 OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
10449 } 10679 }
10450 return true; 10680 return true;
@@ -11018,11 +11248,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11018 11248
11019 StartLure handlerStartLure = OnStartLure; 11249 StartLure handlerStartLure = OnStartLure;
11020 if (handlerStartLure != null) 11250 if (handlerStartLure != null)
11021 handlerStartLure(startLureRequest.Info.LureType, 11251 {
11022 Utils.BytesToString( 11252 for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
11023 startLureRequest.Info.Message), 11253 {
11024 startLureRequest.TargetData[0].TargetID, 11254 handlerStartLure(startLureRequest.Info.LureType,
11025 this); 11255 Utils.BytesToString(
11256 startLureRequest.Info.Message),
11257 startLureRequest.TargetData[i].TargetID,
11258 this);
11259 }
11260 }
11026 return true; 11261 return true;
11027 } 11262 }
11028 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) 11263 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -11136,10 +11371,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11136 } 11371 }
11137 #endregion 11372 #endregion
11138 11373
11139 ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; 11374 ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
11140 if (handlerClassifiedGodDelete != null) 11375 if (handlerClassifiedGodDelete != null)
11141 handlerClassifiedGodDelete( 11376 handlerClassifiedGodDelete(
11142 classifiedGodDelete.Data.ClassifiedID, 11377 classifiedGodDelete.Data.ClassifiedID,
11378 classifiedGodDelete.Data.QueryID,
11143 this); 11379 this);
11144 return true; 11380 return true;
11145 } 11381 }
@@ -11452,6 +11688,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11452 11688
11453 if (cachedtex.AgentData.SessionID != SessionId) 11689 if (cachedtex.AgentData.SessionID != SessionId)
11454 return false; 11690 return false;
11691
11455 11692
11456 // TODO: don't create new blocks if recycling an old packet 11693 // TODO: don't create new blocks if recycling an old packet
11457 cachedresp.AgentData.AgentID = AgentId; 11694 cachedresp.AgentData.AgentID = AgentId;
@@ -11461,14 +11698,140 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11461 cachedresp.WearableData = 11698 cachedresp.WearableData =
11462 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; 11699 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
11463 11700
11464 for (int i = 0; i < cachedtex.WearableData.Length; i++) 11701 //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>();
11702 // var item = fac.GetBakedTextureFaces(AgentId);
11703 //WearableCacheItem[] items = fac.GetCachedItems(AgentId);
11704
11705 IAssetService cache = m_scene.AssetService;
11706 IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
11707 //bakedTextureModule = null;
11708 int maxWearablesLoop = cachedtex.WearableData.Length;
11709 if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
11710 maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
11711
11712 if (bakedTextureModule != null && cache != null)
11465 { 11713 {
11466 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); 11714 // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
11467 cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; 11715
11468 cachedresp.WearableData[i].TextureID = UUID.Zero; 11716 WearableCacheItem[] cacheItems = null;
11469 cachedresp.WearableData[i].HostName = new byte[0]; 11717 ScenePresence p = m_scene.GetScenePresence(AgentId);
11718 if (p.Appearance != null)
11719 if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
11720 {
11721 try
11722 {
11723 cacheItems = bakedTextureModule.Get(AgentId);
11724 p.Appearance.WearableCacheItems = cacheItems;
11725 p.Appearance.WearableCacheItemsDirty = false;
11726 }
11727
11728 /*
11729 * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
11730 *
11731 catch (System.Net.Sockets.SocketException)
11732 {
11733 cacheItems = null;
11734 }
11735 catch (WebException)
11736 {
11737 cacheItems = null;
11738 }
11739 catch (InvalidOperationException)
11740 {
11741 cacheItems = null;
11742 } */
11743 catch (Exception)
11744 {
11745 cacheItems = null;
11746 }
11747
11748 }
11749 else if (p.Appearance.WearableCacheItems != null)
11750 {
11751 cacheItems = p.Appearance.WearableCacheItems;
11752 }
11753
11754 if (cache != null && cacheItems != null)
11755 {
11756 foreach (WearableCacheItem item in cacheItems)
11757 {
11758
11759 if (cache.GetCached(item.TextureID.ToString()) == null)
11760 {
11761 item.TextureAsset.Temporary = true;
11762 cache.Store(item.TextureAsset);
11763 }
11764
11765
11766 }
11767 }
11768
11769 if (cacheItems != null)
11770 {
11771
11772 for (int i = 0; i < maxWearablesLoop; i++)
11773 {
11774 WearableCacheItem item =
11775 WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems);
11776
11777 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
11778 cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
11779 cachedresp.WearableData[i].HostName = new byte[0];
11780 if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
11781 {
11782
11783 cachedresp.WearableData[i].TextureID = item.TextureID;
11784 }
11785 else
11786 {
11787 cachedresp.WearableData[i].TextureID = UUID.Zero;
11788 }
11789 }
11790 }
11791 else
11792 {
11793 for (int i = 0; i < maxWearablesLoop; i++)
11794 {
11795 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
11796 cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
11797 cachedresp.WearableData[i].TextureID = UUID.Zero;
11798 //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
11799 cachedresp.WearableData[i].HostName = new byte[0];
11800 }
11801 }
11470 } 11802 }
11803 else
11804 {
11805 if (cache == null)
11806 {
11807 for (int i = 0; i < maxWearablesLoop; i++)
11808 {
11809 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
11810 cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
11811 cachedresp.WearableData[i].TextureID = UUID.Zero;
11812 //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
11813 cachedresp.WearableData[i].HostName = new byte[0];
11814 }
11815 }
11816 else
11817 {
11818 for (int i = 0; i < maxWearablesLoop; i++)
11819 {
11820 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
11821 cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
11822
11471 11823
11824
11825 if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
11826 cachedresp.WearableData[i].TextureID = UUID.Zero;
11827 //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
11828 else
11829 cachedresp.WearableData[i].TextureID = UUID.Zero;
11830 // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
11831 cachedresp.WearableData[i].HostName = new byte[0];
11832 }
11833 }
11834 }
11472 cachedresp.Header.Zerocoded = true; 11835 cachedresp.Header.Zerocoded = true;
11473 OutPacket(cachedresp, ThrottleOutPacketType.Task); 11836 OutPacket(cachedresp, ThrottleOutPacketType.Task);
11474 11837
@@ -11505,209 +11868,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11505 } 11868 }
11506 else 11869 else
11507 { 11870 {
11508// m_log.DebugFormat( 11871 ClientChangeObject updatehandler = onClientChangeObject;
11509// "[CLIENT]: Processing block {0} type {1} for {2} {3}",
11510// i, block.Type, part.Name, part.LocalId);
11511 11872
11512// // Do this once since fetch parts creates a new array. 11873 if (updatehandler != null)
11513// SceneObjectPart[] parts = part.ParentGroup.Parts; 11874 {
11514// for (int j = 0; j < parts.Length; j++) 11875 ObjectChangeData udata = new ObjectChangeData();
11515// {
11516// part.StoreUndoState();
11517// parts[j].IgnoreUndoUpdate = true;
11518// }
11519 11876
11520 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; 11877 /*ubit from ll JIRA:
11878 * 0x01 position
11879 * 0x02 rotation
11880 * 0x04 scale
11881
11882 * 0x08 LINK_SET
11883 * 0x10 UNIFORM for scale
11884 */
11521 11885
11522 switch (block.Type) 11886 // translate to internal changes
11523 { 11887 // not all cases .. just the ones older code did
11524 case 1:
11525 Vector3 pos1 = new Vector3(block.Data, 0);
11526 11888
11527 UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11889 switch (block.Type)
11528 if (handlerUpdatePrimSinglePosition != null) 11890 {
11529 { 11891 case 1: //change position sp
11530 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11892 udata.position = new Vector3(block.Data, 0);
11531 handlerUpdatePrimSinglePosition(localId, pos1, this);
11532 }
11533 break;
11534 11893
11535 case 2: 11894 udata.change = ObjectChangeType.primP;
11536 Quaternion rot1 = new Quaternion(block.Data, 0, true); 11895 updatehandler(localId, udata, this);
11896 break;
11537 11897
11538 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 11898 case 2: // rotation sp
11539 if (handlerUpdatePrimSingleRotation != null) 11899 udata.rotation = new Quaternion(block.Data, 0, true);
11540 {
11541 // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
11542 handlerUpdatePrimSingleRotation(localId, rot1, this);
11543 }
11544 break;
11545 11900
11546 case 3: 11901 udata.change = ObjectChangeType.primR;
11547 Vector3 rotPos = new Vector3(block.Data, 0); 11902 updatehandler(localId, udata, this);
11548 Quaternion rot2 = new Quaternion(block.Data, 12, true); 11903 break;
11549 11904
11550 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; 11905 case 3: // position plus rotation
11551 if (handlerUpdatePrimSingleRotationPosition != null) 11906 udata.position = new Vector3(block.Data, 0);
11552 { 11907 udata.rotation = new Quaternion(block.Data, 12, true);
11553 // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
11554 // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
11555 handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
11556 }
11557 break;
11558 11908
11559 case 4: 11909 udata.change = ObjectChangeType.primPR;
11560 case 20: 11910 updatehandler(localId, udata, this);
11561 Vector3 scale4 = new Vector3(block.Data, 0); 11911 break;
11562 11912
11563 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; 11913 case 4: // scale sp
11564 if (handlerUpdatePrimScale != null) 11914 udata.scale = new Vector3(block.Data, 0);
11565 { 11915 udata.change = ObjectChangeType.primS;
11566 // m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
11567 handlerUpdatePrimScale(localId, scale4, this);
11568 }
11569 break;
11570 11916
11571 case 5: 11917 updatehandler(localId, udata, this);
11572 Vector3 scale1 = new Vector3(block.Data, 12); 11918 break;
11573 Vector3 pos11 = new Vector3(block.Data, 0);
11574 11919
11575 handlerUpdatePrimScale = OnUpdatePrimScale; 11920 case 0x14: // uniform scale sp
11576 if (handlerUpdatePrimScale != null) 11921 udata.scale = new Vector3(block.Data, 0);
11577 {
11578 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11579 handlerUpdatePrimScale(localId, scale1, this);
11580 11922
11581 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11923 udata.change = ObjectChangeType.primUS;
11582 if (handlerUpdatePrimSinglePosition != null) 11924 updatehandler(localId, udata, this);
11583 { 11925 break;
11584 handlerUpdatePrimSinglePosition(localId, pos11, this);
11585 }
11586 }
11587 break;
11588 11926
11589 case 9: 11927 case 5: // scale and position sp
11590 Vector3 pos2 = new Vector3(block.Data, 0); 11928 udata.position = new Vector3(block.Data, 0);
11929 udata.scale = new Vector3(block.Data, 12);
11591 11930
11592 UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; 11931 udata.change = ObjectChangeType.primPS;
11932 updatehandler(localId, udata, this);
11933 break;
11593 11934
11594 if (handlerUpdateVector != null) 11935 case 0x15: //uniform scale and position
11595 { 11936 udata.position = new Vector3(block.Data, 0);
11596 handlerUpdateVector(localId, pos2, this); 11937 udata.scale = new Vector3(block.Data, 12);
11597 }
11598 break;
11599 11938
11600 case 10: 11939 udata.change = ObjectChangeType.primPUS;
11601 Quaternion rot3 = new Quaternion(block.Data, 0, true); 11940 updatehandler(localId, udata, this);
11941 break;
11602 11942
11603 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; 11943 // now group related (bit 4)
11604 if (handlerUpdatePrimRotation != null) 11944 case 9: //( 8 + 1 )group position
11605 { 11945 udata.position = new Vector3(block.Data, 0);
11606 // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
11607 handlerUpdatePrimRotation(localId, rot3, this);
11608 }
11609 break;
11610 11946
11611 case 11: 11947 udata.change = ObjectChangeType.groupP;
11612 Vector3 pos3 = new Vector3(block.Data, 0); 11948 updatehandler(localId, udata, this);
11613 Quaternion rot4 = new Quaternion(block.Data, 12, true); 11949 break;
11614 11950
11615 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 11951 case 0x0A: // (8 + 2) group rotation
11616 if (handlerUpdatePrimGroupRotation != null) 11952 udata.rotation = new Quaternion(block.Data, 0, true);
11617 {
11618 // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11619 // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
11620 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
11621 }
11622 break;
11623 case 12:
11624 case 28:
11625 Vector3 scale7 = new Vector3(block.Data, 0);
11626 11953
11627 UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11954 udata.change = ObjectChangeType.groupR;
11628 if (handlerUpdatePrimGroupScale != null) 11955 updatehandler(localId, udata, this);
11629 { 11956 break;
11630 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11631 handlerUpdatePrimGroupScale(localId, scale7, this);
11632 }
11633 break;
11634 11957
11635 case 13: 11958 case 0x0B: //( 8 + 2 + 1) group rotation and position
11636 Vector3 scale2 = new Vector3(block.Data, 12); 11959 udata.position = new Vector3(block.Data, 0);
11637 Vector3 pos4 = new Vector3(block.Data, 0); 11960 udata.rotation = new Quaternion(block.Data, 12, true);
11638 11961
11639 handlerUpdatePrimScale = OnUpdatePrimScale; 11962 udata.change = ObjectChangeType.groupPR;
11640 if (handlerUpdatePrimScale != null) 11963 updatehandler(localId, udata, this);
11641 { 11964 break;
11642 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11643 handlerUpdatePrimScale(localId, scale2, this);
11644 11965
11645 // Change the position based on scale (for bug number 246) 11966 case 0x0C: // (8 + 4) group scale
11646 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11967 // only afects root prim and only sent by viewer editor object tab scaling
11647 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11968 // mouse edition only allows uniform scaling
11648 if (handlerUpdatePrimSinglePosition != null) 11969 // SL MAY CHANGE THIS in viewers
11649 {
11650 handlerUpdatePrimSinglePosition(localId, pos4, this);
11651 }
11652 }
11653 break;
11654 11970
11655 case 29: 11971 udata.scale = new Vector3(block.Data, 0);
11656 Vector3 scale5 = new Vector3(block.Data, 12);
11657 Vector3 pos5 = new Vector3(block.Data, 0);
11658 11972
11659 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11973 udata.change = ObjectChangeType.groupS;
11660 if (handlerUpdatePrimGroupScale != null) 11974 updatehandler(localId, udata, this);
11661 {
11662 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11663 part.StoreUndoState(true);
11664 part.IgnoreUndoUpdate = true;
11665 handlerUpdatePrimGroupScale(localId, scale5, this);
11666 handlerUpdateVector = OnUpdatePrimGroupPosition;
11667 11975
11668 if (handlerUpdateVector != null) 11976 break;
11669 {
11670 handlerUpdateVector(localId, pos5, this);
11671 }
11672 11977
11673 part.IgnoreUndoUpdate = false; 11978 case 0x0D: //(8 + 4 + 1) group scale and position
11674 } 11979 // exception as above
11675 11980
11676 break; 11981 udata.position = new Vector3(block.Data, 0);
11982 udata.scale = new Vector3(block.Data, 12);
11677 11983
11678 case 21: 11984 udata.change = ObjectChangeType.groupPS;
11679 Vector3 scale6 = new Vector3(block.Data, 12); 11985 updatehandler(localId, udata, this);
11680 Vector3 pos6 = new Vector3(block.Data, 0); 11986 break;
11681 11987
11682 handlerUpdatePrimScale = OnUpdatePrimScale; 11988 case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
11683 if (handlerUpdatePrimScale != null) 11989 udata.scale = new Vector3(block.Data, 0);
11684 {
11685 part.StoreUndoState(false);
11686 part.IgnoreUndoUpdate = true;
11687 11990
11688 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 11991 udata.change = ObjectChangeType.groupUS;
11689 handlerUpdatePrimScale(localId, scale6, this); 11992 updatehandler(localId, udata, this);
11690 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11993 break;
11691 if (handlerUpdatePrimSinglePosition != null)
11692 {
11693 handlerUpdatePrimSinglePosition(localId, pos6, this);
11694 }
11695 11994
11696 part.IgnoreUndoUpdate = false; 11995 case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
11697 } 11996 udata.position = new Vector3(block.Data, 0);
11698 break; 11997 udata.scale = new Vector3(block.Data, 12);
11699 11998
11700 default: 11999 udata.change = ObjectChangeType.groupPUS;
11701 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); 12000 updatehandler(localId, udata, this);
11702 break; 12001 break;
12002
12003 default:
12004 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
12005 break;
12006 }
11703 } 12007 }
11704 12008
11705// for (int j = 0; j < parts.Length; j++)
11706// parts[j].IgnoreUndoUpdate = false;
11707 } 12009 }
11708 } 12010 }
11709 } 12011 }
11710
11711 return true; 12012 return true;
11712 } 12013 }
11713 12014
@@ -11768,9 +12069,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11768 public void SetChildAgentThrottle(byte[] throttles) 12069 public void SetChildAgentThrottle(byte[] throttles)
11769 { 12070 {
11770 m_udpClient.SetThrottles(throttles); 12071 m_udpClient.SetThrottles(throttles);
12072 GenericCall2 handler = OnUpdateThrottles;
12073 if (handler != null)
12074 {
12075 handler();
12076 }
11771 } 12077 }
11772 12078
11773 /// <summary> 12079 /// <summary>
12080 /// Sets the throttles from values supplied by the client
12081 /// </summary>
12082 /// <param name="throttles"></param>
12083 public void SetAgentThrottleSilent(int throttle, int setting)
12084 {
12085 m_udpClient.ForceThrottleSetting(throttle,setting);
12086 //m_udpClient.SetThrottles(throttles);
12087
12088 }
12089
12090
12091 /// <summary>
11774 /// Get the current throttles for this client as a packed byte array 12092 /// Get the current throttles for this client as a packed byte array
11775 /// </summary> 12093 /// </summary>
11776 /// <param name="multiplier">Unused</param> 12094 /// <param name="multiplier">Unused</param>
@@ -12157,7 +12475,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12157// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", 12475// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
12158// requestID, taskID, (SourceType)sourceType, Name); 12476// requestID, taskID, (SourceType)sourceType, Name);
12159 12477
12478
12479 //Note, the bool returned from the below function is useless since it is always false.
12160 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 12480 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
12481
12161 } 12482 }
12162 12483
12163 /// <summary> 12484 /// <summary>
@@ -12223,7 +12544,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12223 /// <returns></returns> 12544 /// <returns></returns>
12224 private static int CalculateNumPackets(byte[] data) 12545 private static int CalculateNumPackets(byte[] data)
12225 { 12546 {
12226 const uint m_maxPacketSize = 600; 12547// const uint m_maxPacketSize = 600;
12548 uint m_maxPacketSize = MaxTransferBytesPerPacket;
12227 int numPackets = 1; 12549 int numPackets = 1;
12228 12550
12229 if (data == null) 12551 if (data == null)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 621e0fd..e52ac37 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
92 /// <summary>Packets we have sent that need to be ACKed by the client</summary> 92 /// <summary>Packets we have sent that need to be ACKed by the client</summary>
93 public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection(); 93 public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
94 /// <summary>ACKs that are queued up, waiting to be sent to the client</summary> 94 /// <summary>ACKs that are queued up, waiting to be sent to the client</summary>
95 public readonly OpenSim.Framework.LocklessQueue<uint> PendingAcks = new OpenSim.Framework.LocklessQueue<uint>(); 95 public readonly DoubleLocklessQueue<uint> PendingAcks = new DoubleLocklessQueue<uint>();
96 96
97 /// <summary>Current packet sequence number</summary> 97 /// <summary>Current packet sequence number</summary>
98 public int CurrentSequence; 98 public int CurrentSequence;
@@ -146,7 +146,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
146 /// <summary>Throttle buckets for each packet category</summary> 146 /// <summary>Throttle buckets for each packet category</summary>
147 private readonly TokenBucket[] m_throttleCategories; 147 private readonly TokenBucket[] m_throttleCategories;
148 /// <summary>Outgoing queues for throttled packets</summary> 148 /// <summary>Outgoing queues for throttled packets</summary>
149 private readonly OpenSim.Framework.LocklessQueue<OutgoingPacket>[] m_packetOutboxes = new OpenSim.Framework.LocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT]; 149 private readonly DoubleLocklessQueue<OutgoingPacket>[] m_packetOutboxes = new DoubleLocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT];
150 /// <summary>A container that can hold one packet for each outbox, used to store 150 /// <summary>A container that can hold one packet for each outbox, used to store
151 /// dequeued packets that are being held for throttling</summary> 151 /// dequeued packets that are being held for throttling</summary>
152 private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT]; 152 private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT];
@@ -158,6 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
158 158
159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC 159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
160 private int m_maxRTO = 60000; 160 private int m_maxRTO = 60000;
161 public bool m_deliverPackets = true;
161 162
162 /// <summary> 163 /// <summary>
163 /// Default constructor 164 /// Default constructor
@@ -201,7 +202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
201 ThrottleOutPacketType type = (ThrottleOutPacketType)i; 202 ThrottleOutPacketType type = (ThrottleOutPacketType)i;
202 203
203 // Initialize the packet outboxes, where packets sit while they are waiting for tokens 204 // Initialize the packet outboxes, where packets sit while they are waiting for tokens
204 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>(); 205 m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
205 // Initialize the token buckets that control the throttling for each category 206 // Initialize the token buckets that control the throttling for each category
206 m_throttleCategories[i] = new TokenBucket(m_throttleCategory, rates.GetRate(type)); 207 m_throttleCategories[i] = new TokenBucket(m_throttleCategory, rates.GetRate(type));
207 } 208 }
@@ -429,11 +430,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
429 /// </returns> 430 /// </returns>
430 public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue) 431 public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue)
431 { 432 {
433 return EnqueueOutgoing(packet, forceQueue, false);
434 }
435
436 public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue, bool highPriority)
437 {
432 int category = (int)packet.Category; 438 int category = (int)packet.Category;
433 439
434 if (category >= 0 && category < m_packetOutboxes.Length) 440 if (category >= 0 && category < m_packetOutboxes.Length)
435 { 441 {
436 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 442 DoubleLocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
443
444 if (m_deliverPackets == false)
445 {
446 queue.Enqueue(packet, highPriority);
447 return true;
448 }
449
437 TokenBucket bucket = m_throttleCategories[category]; 450 TokenBucket bucket = m_throttleCategories[category];
438 451
439 // Don't send this packet if there is already a packet waiting in the queue 452 // Don't send this packet if there is already a packet waiting in the queue
@@ -441,7 +454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
441 // queued packets 454 // queued packets
442 if (queue.Count > 0) 455 if (queue.Count > 0)
443 { 456 {
444 queue.Enqueue(packet); 457 queue.Enqueue(packet, highPriority);
445 return true; 458 return true;
446 } 459 }
447 460
@@ -454,7 +467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
454 else 467 else
455 { 468 {
456 // Force queue specified or not enough tokens in the bucket, queue this packet 469 // Force queue specified or not enough tokens in the bucket, queue this packet
457 queue.Enqueue(packet); 470 queue.Enqueue(packet, highPriority);
458 return true; 471 return true;
459 } 472 }
460 } 473 }
@@ -483,8 +496,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
483 /// <returns>True if any packets were sent, otherwise false</returns> 496 /// <returns>True if any packets were sent, otherwise false</returns>
484 public bool DequeueOutgoing() 497 public bool DequeueOutgoing()
485 { 498 {
486 OutgoingPacket packet; 499 if (m_deliverPackets == false) return false;
487 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 500
501 OutgoingPacket packet = null;
502 DoubleLocklessQueue<OutgoingPacket> queue;
488 TokenBucket bucket; 503 TokenBucket bucket;
489 bool packetSent = false; 504 bool packetSent = false;
490 ThrottleOutPacketTypeFlags emptyCategories = 0; 505 ThrottleOutPacketTypeFlags emptyCategories = 0;
@@ -515,32 +530,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
515 // No dequeued packet waiting to be sent, try to pull one off 530 // No dequeued packet waiting to be sent, try to pull one off
516 // this queue 531 // this queue
517 queue = m_packetOutboxes[i]; 532 queue = m_packetOutboxes[i];
518 if (queue.Dequeue(out packet)) 533 if (queue != null)
519 { 534 {
520 // A packet was pulled off the queue. See if we have 535 bool success = false;
521 // enough tokens in the bucket to send it out 536 try
522 if (bucket.RemoveTokens(packet.Buffer.DataLength))
523 { 537 {
524 // Send the packet 538 success = queue.Dequeue(out packet);
525 m_udpServer.SendPacketFinal(packet);
526 packetSent = true;
527 } 539 }
528 else 540 catch
529 { 541 {
530 // Save the dequeued packet for the next iteration 542 m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
531 m_nextPackets[i] = packet;
532 } 543 }
533 544 if (success)
534 // If the queue is empty after this dequeue, fire the queue 545 {
535 // empty callback now so it has a chance to fill before we 546 // A packet was pulled off the queue. See if we have
536 // get back here 547 // enough tokens in the bucket to send it out
537 if (queue.Count == 0) 548 if (bucket.RemoveTokens(packet.Buffer.DataLength))
549 {
550 // Send the packet
551 m_udpServer.SendPacketFinal(packet);
552 packetSent = true;
553 }
554 else
555 {
556 // Save the dequeued packet for the next iteration
557 m_nextPackets[i] = packet;
558 }
559
560 // If the queue is empty after this dequeue, fire the queue
561 // empty callback now so it has a chance to fill before we
562 // get back here
563 if (queue.Count == 0)
564 emptyCategories |= CategoryToFlag(i);
565 }
566 else
567 {
568 // No packets in this queue. Fire the queue empty callback
569 // if it has not been called recently
538 emptyCategories |= CategoryToFlag(i); 570 emptyCategories |= CategoryToFlag(i);
571 }
539 } 572 }
540 else 573 else
541 { 574 {
542 // No packets in this queue. Fire the queue empty callback 575 m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
543 // if it has not been called recently
544 emptyCategories |= CategoryToFlag(i); 576 emptyCategories |= CategoryToFlag(i);
545 } 577 }
546 } 578 }
@@ -649,6 +681,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
649 if (m_nextOnQueueEmpty == 0) 681 if (m_nextOnQueueEmpty == 0)
650 m_nextOnQueueEmpty = 1; 682 m_nextOnQueueEmpty = 1;
651 } 683 }
684 internal void ForceThrottleSetting(int throttle, int setting)
685 {
686 m_throttleCategories[throttle].RequestedDripRate = Math.Max(setting, LLUDPServer.MTU); ;
687 }
652 688
653 /// <summary> 689 /// <summary>
654 /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a 690 /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a
@@ -693,4 +729,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
693 } 729 }
694 } 730 }
695 } 731 }
732
733 public class DoubleLocklessQueue<T> : OpenSim.Framework.LocklessQueue<T>
734 {
735 OpenSim.Framework.LocklessQueue<T> highQueue = new OpenSim.Framework.LocklessQueue<T>();
736
737 public override int Count
738 {
739 get
740 {
741 return base.Count + highQueue.Count;
742 }
743 }
744
745 public override bool Dequeue(out T item)
746 {
747 if (highQueue.Dequeue(out item))
748 return true;
749
750 return base.Dequeue(out item);
751 }
752
753 public void Enqueue(T item, bool highPriority)
754 {
755 if (highPriority)
756 highQueue.Enqueue(item);
757 else
758 Enqueue(item);
759 }
760 }
696} 761}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a7628d2..d49f1f7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -126,7 +126,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
126 /// <summary>Handlers for incoming packets</summary> 126 /// <summary>Handlers for incoming packets</summary>
127 //PacketEventDictionary packetEvents = new PacketEventDictionary(); 127 //PacketEventDictionary packetEvents = new PacketEventDictionary();
128 /// <summary>Incoming packets that are awaiting handling</summary> 128 /// <summary>Incoming packets that are awaiting handling</summary>
129 private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); 129 //private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
130
131 private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>();
130 132
131 /// <summary></summary> 133 /// <summary></summary>
132 //private UDPClientCollection m_clients = new UDPClientCollection(); 134 //private UDPClientCollection m_clients = new UDPClientCollection();
@@ -181,6 +183,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
181 /// <summary>Flag to signal when clients should send pings</summary> 183 /// <summary>Flag to signal when clients should send pings</summary>
182 protected bool m_sendPing; 184 protected bool m_sendPing;
183 185
186 private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
184 private Pool<IncomingPacket> m_incomingPacketPool; 187 private Pool<IncomingPacket> m_incomingPacketPool;
185 188
186 /// <summary> 189 /// <summary>
@@ -800,6 +803,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
800 803
801 #region Queue or Send 804 #region Queue or Send
802 805
806 bool highPriority = false;
807
808 if (category != ThrottleOutPacketType.Unknown && (category & ThrottleOutPacketType.HighPriority) != 0)
809 {
810 category = (ThrottleOutPacketType)((int)category & 127);
811 highPriority = true;
812 }
813
803 OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null); 814 OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null);
804 // If we were not provided a method for handling unacked, use the UDPServer default method 815 // If we were not provided a method for handling unacked, use the UDPServer default method
805 outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method); 816 outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
@@ -808,7 +819,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
808 // continue to display the deleted object until relog. Therefore, we need to always queue a kill object 819 // continue to display the deleted object until relog. Therefore, we need to always queue a kill object
809 // packet so that it isn't sent before a queued update packet. 820 // packet so that it isn't sent before a queued update packet.
810 bool requestQueue = type == PacketType.KillObject; 821 bool requestQueue = type == PacketType.KillObject;
811 if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue)) 822 if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue, highPriority))
812 SendPacketFinal(outgoingPacket); 823 SendPacketFinal(outgoingPacket);
813 824
814 #endregion Queue or Send 825 #endregion Queue or Send
@@ -1093,21 +1104,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1093 1104
1094 #region Packet to Client Mapping 1105 #region Packet to Client Mapping
1095 1106
1096 // UseCircuitCode handling 1107 // If there is already a client for this endpoint, don't process UseCircuitCode
1097 if (packet.Type == PacketType.UseCircuitCode) 1108 IClientAPI client = null;
1109 if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
1098 { 1110 {
1099 // We need to copy the endpoint so that it doesn't get changed when another thread reuses the 1111 // UseCircuitCode handling
1100 // buffer. 1112 if (packet.Type == PacketType.UseCircuitCode)
1101 object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; 1113 {
1114 // And if there is a UseCircuitCode pending, also drop it
1115 lock (m_pendingCache)
1116 {
1117 if (m_pendingCache.Contains(endPoint))
1118 return;
1102 1119
1103 Util.FireAndForget(HandleUseCircuitCode, array); 1120 m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60);
1121 }
1104 1122
1105 return; 1123 // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
1124 // buffer.
1125 object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
1126
1127 Util.FireAndForget(HandleUseCircuitCode, array);
1128
1129 return;
1130 }
1131 }
1132
1133 // If this is a pending connection, enqueue, don't process yet
1134 lock (m_pendingCache)
1135 {
1136 Queue<UDPPacketBuffer> queue;
1137 if (m_pendingCache.TryGetValue(endPoint, out queue))
1138 {
1139 //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
1140 queue.Enqueue(buffer);
1141 return;
1142 }
1106 } 1143 }
1107 1144
1108 // Determine which agent this packet came from 1145 // Determine which agent this packet came from
1109 IClientAPI client; 1146 if (client == null || !(client is LLClientView))
1110 if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
1111 { 1147 {
1112 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); 1148 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
1113 return; 1149 return;
@@ -1116,7 +1152,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1116 udpClient = ((LLClientView)client).UDPClient; 1152 udpClient = ((LLClientView)client).UDPClient;
1117 1153
1118 if (!udpClient.IsConnected) 1154 if (!udpClient.IsConnected)
1155 {
1156// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
1119 return; 1157 return;
1158 }
1120 1159
1121 #endregion Packet to Client Mapping 1160 #endregion Packet to Client Mapping
1122 1161
@@ -1246,7 +1285,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1246 incomingPacket = new IncomingPacket((LLClientView)client, packet); 1285 incomingPacket = new IncomingPacket((LLClientView)client, packet);
1247 } 1286 }
1248 1287
1249 packetInbox.Enqueue(incomingPacket); 1288 if (incomingPacket.Packet.Type == PacketType.AgentUpdate ||
1289 incomingPacket.Packet.Type == PacketType.ChatFromViewer)
1290 packetInbox.EnqueueHigh(incomingPacket);
1291 else
1292 packetInbox.EnqueueLow(incomingPacket);
1250 } 1293 }
1251 1294
1252 #region BinaryStats 1295 #region BinaryStats
@@ -1366,6 +1409,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1366 // We only want to send initial data to new clients, not ones which are being converted from child to root. 1409 // We only want to send initial data to new clients, not ones which are being converted from child to root.
1367 if (client != null) 1410 if (client != null)
1368 client.SceneAgent.SendInitialDataToMe(); 1411 client.SceneAgent.SendInitialDataToMe();
1412
1413 // Now we know we can handle more data
1414 Thread.Sleep(200);
1415
1416 // Obtain the queue and remove it from the cache
1417 Queue<UDPPacketBuffer> queue = null;
1418
1419 lock (m_pendingCache)
1420 {
1421 if (!m_pendingCache.TryGetValue(endPoint, out queue))
1422 {
1423 m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
1424 return;
1425 }
1426 m_pendingCache.Remove(endPoint);
1427 }
1428
1429 m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
1430
1431 // Reinject queued packets
1432 while(queue.Count > 0)
1433 {
1434 UDPPacketBuffer buf = queue.Dequeue();
1435 PacketReceived(buf);
1436 }
1437 queue = null;
1369 } 1438 }
1370 else 1439 else
1371 { 1440 {
@@ -1373,6 +1442,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1373 m_log.WarnFormat( 1442 m_log.WarnFormat(
1374 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", 1443 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
1375 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint); 1444 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
1445 lock (m_pendingCache)
1446 m_pendingCache.Remove(endPoint);
1376 } 1447 }
1377 1448
1378 // m_log.DebugFormat( 1449 // m_log.DebugFormat(
@@ -1491,7 +1562,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1491 if (!client.SceneAgent.IsChildAgent) 1562 if (!client.SceneAgent.IsChildAgent)
1492 client.Kick("Simulator logged you out due to connection timeout"); 1563 client.Kick("Simulator logged you out due to connection timeout");
1493 1564
1494 client.CloseWithoutChecks(); 1565 client.CloseWithoutChecks(true);
1495 } 1566 }
1496 } 1567 }
1497 1568
@@ -1503,6 +1574,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1503 1574
1504 while (IsRunningInbound) 1575 while (IsRunningInbound)
1505 { 1576 {
1577 m_scene.ThreadAlive(1);
1506 try 1578 try
1507 { 1579 {
1508 IncomingPacket incomingPacket = null; 1580 IncomingPacket incomingPacket = null;
@@ -1550,6 +1622,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1550 1622
1551 while (base.IsRunningOutbound) 1623 while (base.IsRunningOutbound)
1552 { 1624 {
1625 m_scene.ThreadAlive(2);
1553 try 1626 try
1554 { 1627 {
1555 m_packetSent = false; 1628 m_packetSent = false;
@@ -1780,8 +1853,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1780 Packet packet = incomingPacket.Packet; 1853 Packet packet = incomingPacket.Packet;
1781 LLClientView client = incomingPacket.Client; 1854 LLClientView client = incomingPacket.Client;
1782 1855
1783 if (client.IsActive) 1856// if (client.IsActive)
1784 { 1857// {
1785 m_currentIncomingClient = client; 1858 m_currentIncomingClient = client;
1786 1859
1787 try 1860 try
@@ -1808,13 +1881,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1808 { 1881 {
1809 m_currentIncomingClient = null; 1882 m_currentIncomingClient = null;
1810 } 1883 }
1811 } 1884// }
1812 else 1885// else
1813 { 1886// {
1814 m_log.DebugFormat( 1887// m_log.DebugFormat(
1815 "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", 1888// "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
1816 packet.Type, client.Name, m_scene.RegionInfo.RegionName); 1889// packet.Type, client.Name, m_scene.RegionInfo.RegionName);
1817 } 1890// }
1818 1891
1819 IncomingPacketsProcessed++; 1892 IncomingPacketsProcessed++;
1820 } 1893 }
@@ -1826,8 +1899,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1826 if (!client.IsLoggingOut) 1899 if (!client.IsLoggingOut)
1827 { 1900 {
1828 client.IsLoggingOut = true; 1901 client.IsLoggingOut = true;
1829 client.Close(); 1902 client.Close(false, false);
1830 } 1903 }
1831 } 1904 }
1832 } 1905 }
1833} \ No newline at end of file 1906}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index f143c32..7035e38 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -114,10 +114,6 @@ namespace OpenMetaverse
114 const int SIO_UDP_CONNRESET = -1744830452; 114 const int SIO_UDP_CONNRESET = -1744830452;
115 115
116 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort); 116 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
117
118 m_log.DebugFormat(
119 "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}",
120 ipep.Address, ipep.Port);
121 117
122 m_udpSocket = new Socket( 118 m_udpSocket = new Socket(
123 AddressFamily.InterNetwork, 119 AddressFamily.InterNetwork,
generated by cgit v1.1 at 2024-10-24 07:21:00 +0000