aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1111
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs65
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs4
5 files changed, 699 insertions, 488 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 4d6081c..c1b5781 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -98,6 +98,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
98 public event AvatarPickerRequest OnAvatarPickerRequest; 98 public event AvatarPickerRequest OnAvatarPickerRequest;
99 public event StartAnim OnStartAnim; 99 public event StartAnim OnStartAnim;
100 public event StopAnim OnStopAnim; 100 public event StopAnim OnStopAnim;
101 public event ChangeAnim OnChangeAnim;
101 public event Action<IClientAPI> OnRequestAvatarsData; 102 public event Action<IClientAPI> OnRequestAvatarsData;
102 public event LinkObjects OnLinkObjects; 103 public event LinkObjects OnLinkObjects;
103 public event DelinkObjects OnDelinkObjects; 104 public event DelinkObjects OnDelinkObjects;
@@ -125,6 +126,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
125 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 126 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
126 public event UpdatePrimFlags OnUpdatePrimFlags; 127 public event UpdatePrimFlags OnUpdatePrimFlags;
127 public event UpdatePrimTexture OnUpdatePrimTexture; 128 public event UpdatePrimTexture OnUpdatePrimTexture;
129 public event ClientChangeObject onClientChangeObject;
128 public event UpdateVector OnUpdatePrimGroupPosition; 130 public event UpdateVector OnUpdatePrimGroupPosition;
129 public event UpdateVector OnUpdatePrimSinglePosition; 131 public event UpdateVector OnUpdatePrimSinglePosition;
130 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 132 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -158,6 +160,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
158 public event RequestTaskInventory OnRequestTaskInventory; 160 public event RequestTaskInventory OnRequestTaskInventory;
159 public event UpdateInventoryItem OnUpdateInventoryItem; 161 public event UpdateInventoryItem OnUpdateInventoryItem;
160 public event CopyInventoryItem OnCopyInventoryItem; 162 public event CopyInventoryItem OnCopyInventoryItem;
163 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
161 public event MoveInventoryItem OnMoveInventoryItem; 164 public event MoveInventoryItem OnMoveInventoryItem;
162 public event RemoveInventoryItem OnRemoveInventoryItem; 165 public event RemoveInventoryItem OnRemoveInventoryItem;
163 public event RemoveInventoryFolder OnRemoveInventoryFolder; 166 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -256,7 +259,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
256 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 259 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
257 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 260 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
258 public event ClassifiedDelete OnClassifiedDelete; 261 public event ClassifiedDelete OnClassifiedDelete;
259 public event ClassifiedDelete OnClassifiedGodDelete; 262 public event ClassifiedGodDelete OnClassifiedGodDelete;
260 public event EventNotificationAddRequest OnEventNotificationAddRequest; 263 public event EventNotificationAddRequest OnEventNotificationAddRequest;
261 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 264 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
262 public event EventGodDelete OnEventGodDelete; 265 public event EventGodDelete OnEventGodDelete;
@@ -287,6 +290,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
287 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 290 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
288 public event SimWideDeletesDelegate OnSimWideDeletes; 291 public event SimWideDeletesDelegate OnSimWideDeletes;
289 public event SendPostcard OnSendPostcard; 292 public event SendPostcard OnSendPostcard;
293 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
290 public event MuteListEntryUpdate OnUpdateMuteListEntry; 294 public event MuteListEntryUpdate OnUpdateMuteListEntry;
291 public event MuteListEntryRemove OnRemoveMuteListEntry; 295 public event MuteListEntryRemove OnRemoveMuteListEntry;
292 public event GodlikeMessage onGodlikeMessage; 296 public event GodlikeMessage onGodlikeMessage;
@@ -325,6 +329,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
325 private Prioritizer m_prioritizer; 329 private Prioritizer m_prioritizer;
326 private bool m_disableFacelights = false; 330 private bool m_disableFacelights = false;
327 331
332 private const uint MaxTransferBytesPerPacket = 600;
333
334
328 /// <value> 335 /// <value>
329 /// List used in construction of data blocks for an object update packet. This is to stop us having to 336 /// List used in construction of data blocks for an object update packet. This is to stop us having to
330 /// continually recreate it. 337 /// continually recreate it.
@@ -336,7 +343,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
336 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an 343 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an
337 /// ownerless phantom. 344 /// ownerless phantom.
338 /// 345 ///
339 /// All manipulation of this set has to occur under a lock 346 /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
340 /// 347 ///
341 /// </value> 348 /// </value>
342 protected HashSet<uint> m_killRecord; 349 protected HashSet<uint> m_killRecord;
@@ -344,6 +351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
344// protected HashSet<uint> m_attachmentsSent; 351// protected HashSet<uint> m_attachmentsSent;
345 352
346 private int m_moneyBalance; 353 private int m_moneyBalance;
354 private bool m_deliverPackets = true;
347 private int m_animationSequenceNumber = 1; 355 private int m_animationSequenceNumber = 1;
348 private bool m_SendLogoutPacketWhenClosing = true; 356 private bool m_SendLogoutPacketWhenClosing = true;
349 private AgentUpdateArgs lastarg; 357 private AgentUpdateArgs lastarg;
@@ -383,6 +391,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
383 get { return m_startpos; } 391 get { return m_startpos; }
384 set { m_startpos = value; } 392 set { m_startpos = value; }
385 } 393 }
394 public bool DeliverPackets
395 {
396 get { return m_deliverPackets; }
397 set {
398 m_deliverPackets = value;
399 m_udpClient.m_deliverPackets = value;
400 }
401 }
386 public UUID AgentId { get { return m_agentId; } } 402 public UUID AgentId { get { return m_agentId; } }
387 public ISceneAgent SceneAgent { get; set; } 403 public ISceneAgent SceneAgent { get; set; }
388 public UUID ActiveGroupId { get { return m_activeGroupID; } } 404 public UUID ActiveGroupId { get { return m_activeGroupID; } }
@@ -485,18 +501,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
485 501
486 #region Client Methods 502 #region Client Methods
487 503
504
488 /// <summary> 505 /// <summary>
489 /// Shut down the client view 506 /// Shut down the client view
490 /// </summary> 507 /// </summary>
491 public void Close() 508 public void Close()
492 { 509 {
510 Close(true);
511 }
512
513 /// <summary>
514 /// Shut down the client view
515 /// </summary>
516 public void Close(bool sendStop)
517 {
493 m_log.DebugFormat( 518 m_log.DebugFormat(
494 "[CLIENT]: Close has been called for {0} attached to scene {1}", 519 "[CLIENT]: Close has been called for {0} attached to scene {1}",
495 Name, m_scene.RegionInfo.RegionName); 520 Name, m_scene.RegionInfo.RegionName);
496 521
497 // Send the STOP packet 522 if (sendStop)
498 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 523 {
499 OutPacket(disable, ThrottleOutPacketType.Unknown); 524 // Send the STOP packet
525 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
526 OutPacket(disable, ThrottleOutPacketType.Unknown);
527 }
500 528
501 IsActive = false; 529 IsActive = false;
502 530
@@ -796,7 +824,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
796 reply.ChatData.OwnerID = fromAgentID; 824 reply.ChatData.OwnerID = fromAgentID;
797 reply.ChatData.SourceID = fromAgentID; 825 reply.ChatData.SourceID = fromAgentID;
798 826
799 OutPacket(reply, ThrottleOutPacketType.Task); 827 OutPacket(reply, ThrottleOutPacketType.Unknown);
800 } 828 }
801 829
802 /// <summary> 830 /// <summary>
@@ -1082,6 +1110,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1082 public virtual void SendLayerData(float[] map) 1110 public virtual void SendLayerData(float[] map)
1083 { 1111 {
1084 Util.FireAndForget(DoSendLayerData, map); 1112 Util.FireAndForget(DoSendLayerData, map);
1113
1114 // Send it sync, and async. It's not that much data
1115 // and it improves user experience just so much!
1116 DoSendLayerData(map);
1085 } 1117 }
1086 1118
1087 /// <summary> 1119 /// <summary>
@@ -1094,16 +1126,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1094 1126
1095 try 1127 try
1096 { 1128 {
1097 //for (int y = 0; y < 16; y++) 1129 for (int y = 0; y < 16; y++)
1098 //{ 1130 {
1099 // for (int x = 0; x < 16; x++) 1131 for (int x = 0; x < 16; x+=4)
1100 // { 1132 {
1101 // SendLayerData(x, y, map); 1133 SendLayerPacket(x, y, map);
1102 // } 1134 }
1103 //} 1135 }
1104
1105 // Send LayerData in a spiral pattern. Fun!
1106 SendLayerTopRight(map, 0, 0, 15, 15);
1107 } 1136 }
1108 catch (Exception e) 1137 catch (Exception e)
1109 { 1138 {
@@ -1111,51 +1140,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1111 } 1140 }
1112 } 1141 }
1113 1142
1114 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1115 {
1116 // Row
1117 for (int i = x1; i <= x2; i++)
1118 SendLayerData(i, y1, map);
1119
1120 // Column
1121 for (int j = y1 + 1; j <= y2; j++)
1122 SendLayerData(x2, j, map);
1123
1124 if (x2 - x1 > 0)
1125 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1126 }
1127
1128 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1129 {
1130 // Row in reverse
1131 for (int i = x2; i >= x1; i--)
1132 SendLayerData(i, y2, map);
1133
1134 // Column in reverse
1135 for (int j = y2 - 1; j >= y1; j--)
1136 SendLayerData(x1, j, map);
1137
1138 if (x2 - x1 > 0)
1139 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1140 }
1141
1142 /// <summary> 1143 /// <summary>
1143 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1144 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1144 /// </summary> 1145 /// </summary>
1145 /// <param name="map">heightmap</param> 1146 /// <param name="map">heightmap</param>
1146 /// <param name="px">X coordinate for patches 0..12</param> 1147 /// <param name="px">X coordinate for patches 0..12</param>
1147 /// <param name="py">Y coordinate for patches 0..15</param> 1148 /// <param name="py">Y coordinate for patches 0..15</param>
1148 // private void SendLayerPacket(float[] map, int y, int x) 1149 private void SendLayerPacket(int x, int y, float[] map)
1149 // { 1150 {
1150 // int[] patches = new int[4]; 1151 int[] patches = new int[4];
1151 // patches[0] = x + 0 + y * 16; 1152 patches[0] = x + 0 + y * 16;
1152 // patches[1] = x + 1 + y * 16; 1153 patches[1] = x + 1 + y * 16;
1153 // patches[2] = x + 2 + y * 16; 1154 patches[2] = x + 2 + y * 16;
1154 // patches[3] = x + 3 + y * 16; 1155 patches[3] = x + 3 + y * 16;
1155 1156
1156 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1157 float[] heightmap = (map.Length == 65536) ?
1157 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1158 map :
1158 // } 1159 LLHeightFieldMoronize(map);
1160
1161 try
1162 {
1163 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1164 OutPacket(layerpack, ThrottleOutPacketType.Land);
1165 }
1166 catch
1167 {
1168 for (int px = x ; px < x + 4 ; px++)
1169 SendLayerData(px, y, map);
1170 }
1171 }
1159 1172
1160 /// <summary> 1173 /// <summary>
1161 /// Sends a specified patch to a client 1174 /// Sends a specified patch to a client
@@ -1175,7 +1188,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1175 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1188 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1176 layerpack.Header.Reliable = true; 1189 layerpack.Header.Reliable = true;
1177 1190
1178 OutPacket(layerpack, ThrottleOutPacketType.Land); 1191 OutPacket(layerpack, ThrottleOutPacketType.Task);
1179 } 1192 }
1180 catch (Exception e) 1193 catch (Exception e)
1181 { 1194 {
@@ -1538,7 +1551,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1538 1551
1539 public void SendKillObject(ulong regionHandle, List<uint> localIDs) 1552 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1540 { 1553 {
1541// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1554// foreach (uint id in localIDs)
1555// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1542 1556
1543 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1557 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1544 // TODO: don't create new blocks if recycling an old packet 1558 // TODO: don't create new blocks if recycling an old packet
@@ -2300,6 +2314,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2300 OutPacket(sound, ThrottleOutPacketType.Task); 2314 OutPacket(sound, ThrottleOutPacketType.Task);
2301 } 2315 }
2302 2316
2317 public void SendTransferAbort(TransferRequestPacket transferRequest)
2318 {
2319 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2320 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2321 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2322 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2323 OutPacket(abort, ThrottleOutPacketType.Task);
2324 }
2325
2303 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2326 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2304 { 2327 {
2305 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2328 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2592,6 +2615,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2592 } 2615 }
2593 } 2616 }
2594 2617
2618 public void SendPartPhysicsProprieties(ISceneEntity entity)
2619 {
2620 SceneObjectPart part = (SceneObjectPart)entity;
2621 if (part != null && AgentId != UUID.Zero)
2622 {
2623 try
2624 {
2625 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
2626 if (eq != null)
2627 {
2628 uint localid = part.LocalId;
2629 byte physshapetype = part.PhysicsShapeType;
2630 float density = part.Density;
2631 float friction = part.Friction;
2632 float bounce = part.Bounciness;
2633 float gravmod = part.GravityModifier;
2634
2635 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
2636 }
2637 }
2638 catch (Exception ex)
2639 {
2640 m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
2641 }
2642 part.UpdatePhysRequired = false;
2643 }
2644 }
2645
2646
2595 2647
2596 public void SendGroupNameReply(UUID groupLLUID, string GroupName) 2648 public void SendGroupNameReply(UUID groupLLUID, string GroupName)
2597 { 2649 {
@@ -2689,7 +2741,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2689 else 2741 else
2690 { 2742 {
2691 int processedLength = 0; 2743 int processedLength = 0;
2692 int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; 2744// int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
2745
2746 int maxChunkSize = (int) MaxTransferBytesPerPacket;
2693 int packetNumber = 0; 2747 int packetNumber = 0;
2694 2748
2695 while (processedLength < req.AssetInf.Data.Length) 2749 while (processedLength < req.AssetInf.Data.Length)
@@ -2747,7 +2801,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2747 reply.Data.ParcelID = parcelID; 2801 reply.Data.ParcelID = parcelID;
2748 reply.Data.OwnerID = land.OwnerID; 2802 reply.Data.OwnerID = land.OwnerID;
2749 reply.Data.Name = Utils.StringToBytes(land.Name); 2803 reply.Data.Name = Utils.StringToBytes(land.Name);
2750 reply.Data.Desc = Utils.StringToBytes(land.Description); 2804 if (land != null && land.Description != null && land.Description != String.Empty)
2805 reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
2806 else
2807 reply.Data.Desc = new Byte[0];
2751 reply.Data.ActualArea = land.Area; 2808 reply.Data.ActualArea = land.Area;
2752 reply.Data.BillableArea = land.Area; // TODO: what is this? 2809 reply.Data.BillableArea = land.Area; // TODO: what is this?
2753 2810
@@ -3482,7 +3539,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3482 3539
3483 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); 3540 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
3484 // TODO: don't create new blocks if recycling an old packet 3541 // TODO: don't create new blocks if recycling an old packet
3485 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 3542 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
3486 avp.ObjectData.TextureEntry = textureEntry; 3543 avp.ObjectData.TextureEntry = textureEntry;
3487 3544
3488 AvatarAppearancePacket.VisualParamBlock avblock = null; 3545 AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3610,7 +3667,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3610 /// </summary> 3667 /// </summary>
3611 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3668 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3612 { 3669 {
3613 //double priority = m_prioritizer.GetUpdatePriority(this, entity); 3670 if (entity is SceneObjectPart)
3671 {
3672 SceneObjectPart e = (SceneObjectPart)entity;
3673 SceneObjectGroup g = e.ParentGroup;
3674 if (g.RootPart.Shape.State > 30) // HUD
3675 if (g.OwnerID != AgentId)
3676 return; // Don't send updates for other people's HUDs
3677 }
3678
3614 uint priority = m_prioritizer.GetUpdatePriority(this, entity); 3679 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3615 3680
3616 lock (m_entityUpdates.SyncRoot) 3681 lock (m_entityUpdates.SyncRoot)
@@ -3677,211 +3742,238 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3677 3742
3678 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race 3743 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
3679 // condition where a kill can be processed before an out-of-date update for the same object. 3744 // condition where a kill can be processed before an out-of-date update for the same object.
3680 lock (m_killRecord) 3745 float avgTimeDilation = 1.0f;
3746 IEntityUpdate iupdate;
3747 Int32 timeinqueue; // this is just debugging code & can be dropped later
3748
3749 while (updatesThisCall < maxUpdates)
3681 { 3750 {
3682 float avgTimeDilation = 1.0f; 3751 lock (m_entityUpdates.SyncRoot)
3683 IEntityUpdate iupdate; 3752 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3684 Int32 timeinqueue; // this is just debugging code & can be dropped later 3753 break;
3685
3686 while (updatesThisCall < maxUpdates)
3687 {
3688 lock (m_entityUpdates.SyncRoot)
3689 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3690 break;
3691 3754
3692 EntityUpdate update = (EntityUpdate)iupdate; 3755 EntityUpdate update = (EntityUpdate)iupdate;
3693 3756
3694 avgTimeDilation += update.TimeDilation; 3757 avgTimeDilation += update.TimeDilation;
3695 avgTimeDilation *= 0.5f; 3758 avgTimeDilation *= 0.5f;
3696 3759
3697 if (update.Entity is SceneObjectPart) 3760 if (update.Entity is SceneObjectPart)
3761 {
3762 SceneObjectPart part = (SceneObjectPart)update.Entity;
3763
3764 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
3765 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good
3766 // safety measure.
3767 //
3768 // If a Linden Lab 1.23.5 client (and possibly later and earlier) receives an object update
3769 // after a kill, it will keep displaying the deleted object until relog. OpenSim currently performs
3770 // updates and kills on different threads with different scheduling strategies, hence this protection.
3771 //
3772 // This doesn't appear to apply to child prims - a client will happily ignore these updates
3773 // after the root prim has been deleted.
3774 lock (m_killRecord)
3698 { 3775 {
3699 SceneObjectPart part = (SceneObjectPart)update.Entity;
3700
3701 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
3702 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good
3703 // safety measure.
3704 //
3705 // If a Linden Lab 1.23.5 client (and possibly later and earlier) receives an object update
3706 // after a kill, it will keep displaying the deleted object until relog. OpenSim currently performs
3707 // updates and kills on different threads with different scheduling strategies, hence this protection.
3708 //
3709 // This doesn't appear to apply to child prims - a client will happily ignore these updates
3710 // after the root prim has been deleted.
3711 if (m_killRecord.Contains(part.LocalId)) 3776 if (m_killRecord.Contains(part.LocalId))
3712 {
3713 // m_log.WarnFormat(
3714 // "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted",
3715 // part.LocalId, Name);
3716 continue; 3777 continue;
3717 } 3778 if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3718 3779 continue;
3719 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3780 }
3781
3782 if (part.ParentGroup.IsDeleted)
3783 continue;
3784
3785 if (part.ParentGroup.IsAttachment)
3786 { // Someone else's HUD, why are we getting these?
3787 if (part.ParentGroup.OwnerID != AgentId &&
3788 part.ParentGroup.RootPart.Shape.State >= 30)
3789 continue;
3790 ScenePresence sp;
3791 // Owner is not in the sim, don't update it to
3792 // anyone
3793 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
3794 continue;
3795
3796 List<SceneObjectGroup> atts = sp.GetAttachments();
3797 bool found = false;
3798 foreach (SceneObjectGroup att in atts)
3720 { 3799 {
3721 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && 3800 if (att == part.ParentGroup)
3722 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3723 { 3801 {
3724 part.Shape.LightEntry = false; 3802 found = true;
3803 break;
3725 } 3804 }
3726 } 3805 }
3806
3807 // It's an attachment of a valid avatar, but
3808 // doesn't seem to be attached, skip
3809 if (!found)
3810 continue;
3811
3812 // On vehicle crossing, the attachments are received
3813 // while the avatar is still a child. Don't send
3814 // updates here because the LocalId has not yet
3815 // been updated and the viewer will derender the
3816 // attachments until the avatar becomes root.
3817 if (sp.IsChildAgent)
3818 continue;
3727 } 3819 }
3728 3820 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3729 ++updatesThisCall;
3730
3731 #region UpdateFlags to packet type conversion
3732
3733 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
3734
3735 bool canUseCompressed = true;
3736 bool canUseImproved = true;
3737
3738 // Compressed object updates only make sense for LL primitives
3739 if (!(update.Entity is SceneObjectPart))
3740 {
3741 canUseCompressed = false;
3742 }
3743
3744 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3745 {
3746 canUseCompressed = false;
3747 canUseImproved = false;
3748 }
3749 else
3750 { 3821 {
3751 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) || 3822 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
3752 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) || 3823 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3753 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3754 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3755 {
3756 canUseCompressed = false;
3757 }
3758
3759 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3760 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3761 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3762 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3763 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3764 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3765 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3766 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3767 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3768 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3769 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3770 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3771 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3772 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3773 { 3824 {
3774 canUseImproved = false; 3825 part.Shape.LightEntry = false;
3775 } 3826 }
3776 } 3827 }
3777 3828 }
3778 #endregion UpdateFlags to packet type conversion 3829
3779 3830 ++updatesThisCall;
3780 #region Block Construction 3831
3781 3832 #region UpdateFlags to packet type conversion
3782 // TODO: Remove this once we can build compressed updates 3833
3834 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
3835
3836 bool canUseCompressed = true;
3837 bool canUseImproved = true;
3838
3839 // Compressed object updates only make sense for LL primitives
3840 if (!(update.Entity is SceneObjectPart))
3841 {
3783 canUseCompressed = false; 3842 canUseCompressed = false;
3784 3843 }
3785 if (!canUseImproved && !canUseCompressed) 3844
3786 { 3845 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3787 if (update.Entity is ScenePresence) 3846 {
3788 { 3847 canUseCompressed = false;
3789 objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity)); 3848 canUseImproved = false;
3790 objectUpdates.Value.Add(update); 3849 }
3791 } 3850 else
3792 else 3851 {
3793 { 3852 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3794 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); 3853 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3795 objectUpdates.Value.Add(update); 3854 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3796 } 3855 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3797 }
3798 else if (!canUseImproved)
3799 { 3856 {
3800 compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags)); 3857 canUseCompressed = false;
3801 compressedUpdates.Value.Add(update);
3802 } 3858 }
3803 else 3859
3860 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3861 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3862 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3863 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3864 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3865 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3866 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3867 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3868 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3869 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3870 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3871 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3872 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3873 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3804 { 3874 {
3805 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) 3875 canUseImproved = false;
3806 {
3807 // Self updates go into a special list
3808 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3809 terseAgentUpdates.Value.Add(update);
3810 }
3811 else
3812 {
3813 // Everything else goes here
3814 terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3815 terseUpdates.Value.Add(update);
3816 }
3817 } 3876 }
3818
3819 #endregion Block Construction
3820 } 3877 }
3821
3822
3823 #region Packet Sending
3824 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
3825 3878
3826 if (terseAgentUpdateBlocks.IsValueCreated) 3879 #endregion UpdateFlags to packet type conversion
3827 {
3828 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
3829 3880
3830 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket(); 3881 #region Block Construction
3831 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3832 packet.RegionData.TimeDilation = timeDilation;
3833 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3834 3882
3835 for (int i = 0; i < blocks.Count; i++) 3883 // TODO: Remove this once we can build compressed updates
3836 packet.ObjectData[i] = blocks[i]; 3884 canUseCompressed = false;
3837 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3838 OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
3839 }
3840 3885
3841 if (objectUpdateBlocks.IsValueCreated) 3886 if (!canUseImproved && !canUseCompressed)
3842 { 3887 {
3843 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value; 3888 if (update.Entity is ScenePresence)
3844 3889 {
3845 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); 3890 objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
3846 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3891 }
3847 packet.RegionData.TimeDilation = timeDilation; 3892 else
3848 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 3893 {
3849 3894 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
3850 for (int i = 0; i < blocks.Count; i++) 3895 }
3851 packet.ObjectData[i] = blocks[i];
3852 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3853 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
3854 } 3896 }
3855 3897 else if (!canUseImproved)
3856 if (compressedUpdateBlocks.IsValueCreated)
3857 { 3898 {
3858 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value; 3899 compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
3859
3860 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
3861 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3862 packet.RegionData.TimeDilation = timeDilation;
3863 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
3864
3865 for (int i = 0; i < blocks.Count; i++)
3866 packet.ObjectData[i] = blocks[i];
3867 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3868 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
3869 } 3900 }
3870 3901 else
3871 if (terseUpdateBlocks.IsValueCreated)
3872 { 3902 {
3873 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value; 3903 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
3874 3904 // Self updates go into a special list
3875 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket(); 3905 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3876 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3906 else
3877 packet.RegionData.TimeDilation = timeDilation; 3907 // Everything else goes here
3878 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 3908 terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3879
3880 for (int i = 0; i < blocks.Count; i++)
3881 packet.ObjectData[i] = blocks[i];
3882 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3883 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
3884 } 3909 }
3910
3911 #endregion Block Construction
3912 }
3913
3914 #region Packet Sending
3915
3916 const float TIME_DILATION = 1.0f;
3917 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
3918
3919 if (terseAgentUpdateBlocks.IsValueCreated)
3920 {
3921 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
3922
3923 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3924 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3925 packet.RegionData.TimeDilation = timeDilation;
3926 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3927
3928 for (int i = 0; i < blocks.Count; i++)
3929 packet.ObjectData[i] = blocks[i];
3930
3931 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3932 }
3933
3934 if (objectUpdateBlocks.IsValueCreated)
3935 {
3936 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
3937
3938 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
3939 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3940 packet.RegionData.TimeDilation = timeDilation;
3941 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3942
3943 for (int i = 0; i < blocks.Count; i++)
3944 packet.ObjectData[i] = blocks[i];
3945
3946 OutPacket(packet, ThrottleOutPacketType.Task, true);
3947 }
3948
3949 if (compressedUpdateBlocks.IsValueCreated)
3950 {
3951 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
3952
3953 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
3954 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3955 packet.RegionData.TimeDilation = timeDilation;
3956 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
3957
3958 for (int i = 0; i < blocks.Count; i++)
3959 packet.ObjectData[i] = blocks[i];
3960
3961 OutPacket(packet, ThrottleOutPacketType.Task, true);
3962 }
3963
3964 if (terseUpdateBlocks.IsValueCreated)
3965 {
3966 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
3967
3968 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3969 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3970 packet.RegionData.TimeDilation = timeDilation;
3971 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3972
3973 for (int i = 0; i < blocks.Count; i++)
3974 packet.ObjectData[i] = blocks[i];
3975
3976 OutPacket(packet, ThrottleOutPacketType.Task, true);
3885 } 3977 }
3886 3978
3887 #endregion Packet Sending 3979 #endregion Packet Sending
@@ -4174,11 +4266,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4174 4266
4175 // Pass in the delegate so that if this packet needs to be resent, we send the current properties 4267 // Pass in the delegate so that if this packet needs to be resent, we send the current properties
4176 // of the object rather than the properties when the packet was created 4268 // of the object rather than the properties when the packet was created
4177 OutPacket(packet, ThrottleOutPacketType.Task, true, 4269 // HACK : Remove intelligent resending until it's fixed in core
4178 delegate(OutgoingPacket oPacket) 4270 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4179 { 4271 // delegate(OutgoingPacket oPacket)
4180 ResendPropertyUpdates(updates, oPacket); 4272 // {
4181 }); 4273 // ResendPropertyUpdates(updates, oPacket);
4274 // });
4275 OutPacket(packet, ThrottleOutPacketType.Task, true);
4182 4276
4183 // pbcnt += blocks.Count; 4277 // pbcnt += blocks.Count;
4184 // ppcnt++; 4278 // ppcnt++;
@@ -4204,11 +4298,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4204 // of the object rather than the properties when the packet was created 4298 // of the object rather than the properties when the packet was created
4205 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); 4299 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
4206 updates.Add(familyUpdates.Value[i]); 4300 updates.Add(familyUpdates.Value[i]);
4207 OutPacket(packet, ThrottleOutPacketType.Task, true, 4301 // HACK : Remove intelligent resending until it's fixed in core
4208 delegate(OutgoingPacket oPacket) 4302 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4209 { 4303 // delegate(OutgoingPacket oPacket)
4210 ResendPropertyUpdates(updates, oPacket); 4304 // {
4211 }); 4305 // ResendPropertyUpdates(updates, oPacket);
4306 // });
4307 OutPacket(packet, ThrottleOutPacketType.Task, true);
4212 4308
4213 // fpcnt++; 4309 // fpcnt++;
4214 // fbcnt++; 4310 // fbcnt++;
@@ -4357,37 +4453,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4357 if (bl[i].BannedUserID == UUID.Zero) 4453 if (bl[i].BannedUserID == UUID.Zero)
4358 continue; 4454 continue;
4359 BannedUsers.Add(bl[i].BannedUserID); 4455 BannedUsers.Add(bl[i].BannedUserID);
4360 }
4361 4456
4362 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 4457 if (BannedUsers.Count >= 50 || (i == (bl.Length - 1) && BannedUsers.Count > 0))
4363 packet.AgentData.TransactionID = UUID.Random(); 4458 {
4364 packet.AgentData.AgentID = AgentId; 4459 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
4365 packet.AgentData.SessionID = SessionId; 4460 packet.AgentData.TransactionID = UUID.Random();
4366 packet.MethodData.Invoice = invoice; 4461 packet.AgentData.AgentID = AgentId;
4367 packet.MethodData.Method = Utils.StringToBytes("setaccess"); 4462 packet.AgentData.SessionID = SessionId;
4463 packet.MethodData.Invoice = invoice;
4464 packet.MethodData.Method = Utils.StringToBytes("setaccess");
4368 4465
4369 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + BannedUsers.Count]; 4466 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + BannedUsers.Count];
4370 4467
4371 for (int i = 0; i < (6 + BannedUsers.Count); i++) 4468 int j;
4372 { 4469 for (j = 0; j < (6 + BannedUsers.Count); j++)
4373 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock(); 4470 {
4374 } 4471 returnblock[j] = new EstateOwnerMessagePacket.ParamListBlock();
4375 int j = 0; 4472 }
4473 j = 0;
4376 4474
4377 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++; 4475 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++;
4378 returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++; 4476 returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++;
4379 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4477 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4380 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4478 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4381 returnblock[j].Parameter = Utils.StringToBytes(BannedUsers.Count.ToString()); j++; 4479 returnblock[j].Parameter = Utils.StringToBytes(BannedUsers.Count.ToString()); j++;
4382 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4480 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4383 4481
4384 foreach (UUID banned in BannedUsers) 4482 foreach (UUID banned in BannedUsers)
4385 { 4483 {
4386 returnblock[j].Parameter = banned.GetBytes(); j++; 4484 returnblock[j].Parameter = banned.GetBytes(); j++;
4485 }
4486 packet.ParamList = returnblock;
4487 packet.Header.Reliable = true;
4488 OutPacket(packet, ThrottleOutPacketType.Task);
4489
4490 BannedUsers.Clear();
4491 }
4387 } 4492 }
4388 packet.ParamList = returnblock; 4493
4389 packet.Header.Reliable = false;
4390 OutPacket(packet, ThrottleOutPacketType.Task);
4391 } 4494 }
4392 4495
4393 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) 4496 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
@@ -4573,7 +4676,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4573 4676
4574 if (landData.SimwideArea > 0) 4677 if (landData.SimwideArea > 0)
4575 { 4678 {
4576 int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); 4679 int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
4680 // Never report more than sim total capacity
4681 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
4682 simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
4577 updateMessage.SimWideMaxPrims = simulatorCapacity; 4683 updateMessage.SimWideMaxPrims = simulatorCapacity;
4578 } 4684 }
4579 else 4685 else
@@ -4702,14 +4808,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4702 4808
4703 if (notifyCount > 0) 4809 if (notifyCount > 0)
4704 { 4810 {
4705 if (notifyCount > 32) 4811// if (notifyCount > 32)
4706 { 4812// {
4707 m_log.InfoFormat( 4813// m_log.InfoFormat(
4708 "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" 4814// "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}"
4709 + " - a developer might want to investigate whether this is a hard limit", 32); 4815// + " - a developer might want to investigate whether this is a hard limit", 32);
4710 4816//
4711 notifyCount = 32; 4817// notifyCount = 32;
4712 } 4818// }
4713 4819
4714 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock 4820 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
4715 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; 4821 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -4764,9 +4870,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4764 { 4870 {
4765 ScenePresence presence = (ScenePresence)entity; 4871 ScenePresence presence = (ScenePresence)entity;
4766 4872
4873 position = presence.OffsetPosition;
4874 rotation = presence.Rotation;
4875
4876 if (presence.ParentID != 0)
4877 {
4878 SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
4879 if (part != null && part != part.ParentGroup.RootPart)
4880 {
4881 position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
4882 rotation = part.RotationOffset * presence.Rotation;
4883 }
4884 }
4885
4767 attachPoint = 0; 4886 attachPoint = 0;
4768 collisionPlane = presence.CollisionPlane; 4887 collisionPlane = presence.CollisionPlane;
4769 position = presence.OffsetPosition;
4770 velocity = presence.Velocity; 4888 velocity = presence.Velocity;
4771 acceleration = Vector3.Zero; 4889 acceleration = Vector3.Zero;
4772 4890
@@ -4776,7 +4894,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4776// acceleration = new Vector3(1, 0, 0); 4894// acceleration = new Vector3(1, 0, 0);
4777 4895
4778 angularVelocity = Vector3.Zero; 4896 angularVelocity = Vector3.Zero;
4779 rotation = presence.Rotation;
4780 4897
4781 if (sendTexture) 4898 if (sendTexture)
4782 textureEntry = presence.Appearance.Texture.GetBytes(); 4899 textureEntry = presence.Appearance.Texture.GetBytes();
@@ -4881,13 +4998,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4881 4998
4882 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) 4999 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
4883 { 5000 {
5001 Vector3 offsetPosition = data.OffsetPosition;
5002 Quaternion rotation = data.Rotation;
5003 uint parentID = data.ParentID;
5004
5005 if (parentID != 0)
5006 {
5007 SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
5008 if (part != null && part != part.ParentGroup.RootPart)
5009 {
5010 offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
5011 rotation = part.RotationOffset * data.Rotation;
5012 parentID = part.ParentGroup.RootPart.LocalId;
5013 }
5014 }
5015
4884 byte[] objectData = new byte[76]; 5016 byte[] objectData = new byte[76];
4885 5017
4886 data.CollisionPlane.ToBytes(objectData, 0); 5018 data.CollisionPlane.ToBytes(objectData, 0);
4887 data.OffsetPosition.ToBytes(objectData, 16); 5019 offsetPosition.ToBytes(objectData, 16);
4888// data.Velocity.ToBytes(objectData, 28); 5020// data.Velocity.ToBytes(objectData, 28);
4889// data.Acceleration.ToBytes(objectData, 40); 5021// data.Acceleration.ToBytes(objectData, 40);
4890 data.Rotation.ToBytes(objectData, 52); 5022 rotation.ToBytes(objectData, 52);
4891 //data.AngularVelocity.ToBytes(objectData, 64); 5023 //data.AngularVelocity.ToBytes(objectData, 64);
4892 5024
4893 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); 5025 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -4901,7 +5033,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4901 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5033 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
4902 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5034 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
4903 update.ObjectData = objectData; 5035 update.ObjectData = objectData;
4904 update.ParentID = data.ParentID; 5036 update.ParentID = parentID;
4905 update.PathCurve = 16; 5037 update.PathCurve = 16;
4906 update.PathScaleX = 100; 5038 update.PathScaleX = 100;
4907 update.PathScaleY = 100; 5039 update.PathScaleY = 100;
@@ -5242,6 +5374,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5242 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 5374 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
5243 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 5375 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
5244 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 5376 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
5377 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
5245 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 5378 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
5246 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 5379 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
5247 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 5380 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5308,6 +5441,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5308 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); 5441 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
5309 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); 5442 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
5310 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); 5443 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
5444 AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
5311 5445
5312 AddGenericPacketHandler("autopilot", HandleAutopilot); 5446 AddGenericPacketHandler("autopilot", HandleAutopilot);
5313 } 5447 }
@@ -5343,6 +5477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5343 (x.CameraLeftAxis != lastarg.CameraLeftAxis) || 5477 (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
5344 (x.CameraUpAxis != lastarg.CameraUpAxis) || 5478 (x.CameraUpAxis != lastarg.CameraUpAxis) ||
5345 (x.ControlFlags != lastarg.ControlFlags) || 5479 (x.ControlFlags != lastarg.ControlFlags) ||
5480 (x.ControlFlags != 0) ||
5346 (x.Far != lastarg.Far) || 5481 (x.Far != lastarg.Far) ||
5347 (x.Flags != lastarg.Flags) || 5482 (x.Flags != lastarg.Flags) ||
5348 (x.State != lastarg.State) || 5483 (x.State != lastarg.State) ||
@@ -5720,7 +5855,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5720 args.Channel = ch; 5855 args.Channel = ch;
5721 args.From = String.Empty; 5856 args.From = String.Empty;
5722 args.Message = Utils.BytesToString(msg); 5857 args.Message = Utils.BytesToString(msg);
5723 args.Type = ChatTypeEnum.Shout; 5858 args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance
5724 args.Position = new Vector3(); 5859 args.Position = new Vector3();
5725 args.Scene = Scene; 5860 args.Scene = Scene;
5726 args.Sender = this; 5861 args.Sender = this;
@@ -6257,7 +6392,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6257 return true; 6392 return true;
6258 } 6393 }
6259 #endregion 6394 #endregion
6260 6395/*
6261 StartAnim handlerStartAnim = null; 6396 StartAnim handlerStartAnim = null;
6262 StopAnim handlerStopAnim = null; 6397 StopAnim handlerStopAnim = null;
6263 6398
@@ -6281,6 +6416,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6281 } 6416 }
6282 } 6417 }
6283 return true; 6418 return true;
6419*/
6420 ChangeAnim handlerChangeAnim = null;
6421
6422 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
6423 {
6424 handlerChangeAnim = OnChangeAnim;
6425 if (handlerChangeAnim != null)
6426 {
6427 handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
6428 }
6429 }
6430
6431 handlerChangeAnim = OnChangeAnim;
6432 if (handlerChangeAnim != null)
6433 {
6434 handlerChangeAnim(UUID.Zero, false, true);
6435 }
6436
6437 return true;
6284 } 6438 }
6285 6439
6286 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) 6440 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -6906,10 +7060,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6906 // 46,47,48 are special positions within the packet 7060 // 46,47,48 are special positions within the packet
6907 // This may change so perhaps we need a better way 7061 // This may change so perhaps we need a better way
6908 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) 7062 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?)
6909 bool UsePhysics = (data[46] != 0) ? true : false; 7063 /*
6910 bool IsTemporary = (data[47] != 0) ? true : false; 7064 bool UsePhysics = (data[46] != 0) ? true : false;
6911 bool IsPhantom = (data[48] != 0) ? true : false; 7065 bool IsTemporary = (data[47] != 0) ? true : false;
6912 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this); 7066 bool IsPhantom = (data[48] != 0) ? true : false;
7067 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this);
7068 */
7069 bool UsePhysics = flags.AgentData.UsePhysics;
7070 bool IsPhantom = flags.AgentData.IsPhantom;
7071 bool IsTemporary = flags.AgentData.IsTemporary;
7072 ObjectFlagUpdatePacket.ExtraPhysicsBlock[] blocks = flags.ExtraPhysics;
7073 ExtraPhysicsData physdata = new ExtraPhysicsData();
7074
7075 if (blocks == null || blocks.Length == 0)
7076 {
7077 physdata.PhysShapeType = PhysShapeType.invalid;
7078 }
7079 else
7080 {
7081 ObjectFlagUpdatePacket.ExtraPhysicsBlock phsblock = blocks[0];
7082 physdata.PhysShapeType = (PhysShapeType)phsblock.PhysicsShapeType;
7083 physdata.Bounce = phsblock.Restitution;
7084 physdata.Density = phsblock.Density;
7085 physdata.Friction = phsblock.Friction;
7086 physdata.GravitationModifier = phsblock.GravityMultiplier;
7087 }
7088
7089 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
6913 } 7090 }
6914 return true; 7091 return true;
6915 } 7092 }
@@ -9763,7 +9940,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9763 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, 9940 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
9764 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), 9941 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
9765 UpdateMuteListEntry.MuteData.MuteType, 9942 UpdateMuteListEntry.MuteData.MuteType,
9766 UpdateMuteListEntry.AgentData.AgentID); 9943 UpdateMuteListEntry.MuteData.MuteFlags);
9767 return true; 9944 return true;
9768 } 9945 }
9769 return false; 9946 return false;
@@ -9778,8 +9955,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9778 { 9955 {
9779 handlerRemoveMuteListEntry(this, 9956 handlerRemoveMuteListEntry(this,
9780 RemoveMuteListEntry.MuteData.MuteID, 9957 RemoveMuteListEntry.MuteData.MuteID,
9781 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), 9958 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
9782 RemoveMuteListEntry.AgentData.AgentID);
9783 return true; 9959 return true;
9784 } 9960 }
9785 return false; 9961 return false;
@@ -9823,10 +9999,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9823 return false; 9999 return false;
9824 } 10000 }
9825 10001
10002 private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
10003 {
10004 ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
10005 (ChangeInventoryItemFlagsPacket)packet;
10006 ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
10007 if (handlerChangeInventoryItemFlags != null)
10008 {
10009 foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
10010 handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
10011 return true;
10012 }
10013 return false;
10014 }
10015
9826 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) 10016 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
9827 { 10017 {
9828 return true; 10018 return true;
9829 } 10019 }
10020
10021 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
10022 {
10023 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
10024
10025 #region Packet Session and User Check
10026 if (m_checkPackets)
10027 {
10028 if (packet.AgentData.SessionID != SessionId ||
10029 packet.AgentData.AgentID != AgentId)
10030 return true;
10031 }
10032 #endregion
10033 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
10034 List<InventoryItemBase> items = new List<InventoryItemBase>();
10035 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
10036 {
10037 InventoryItemBase b = new InventoryItemBase();
10038 b.ID = n.OldItemID;
10039 b.Folder = n.OldFolderID;
10040 items.Add(b);
10041 }
10042
10043 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
10044 if (handlerMoveItemsAndLeaveCopy != null)
10045 {
10046 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
10047 }
10048
10049 return true;
10050 }
9830 10051
9831 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 10052 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9832 { 10053 {
@@ -10253,6 +10474,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10253 groupProfileReply.GroupData.MaturePublish = d.MaturePublish; 10474 groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
10254 groupProfileReply.GroupData.OwnerRole = d.OwnerRole; 10475 groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
10255 10476
10477 Scene scene = (Scene)m_scene;
10478 if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
10479 {
10480 ScenePresence p;
10481 if (scene.TryGetScenePresence(sender.AgentId, out p))
10482 {
10483 if (p.GodLevel >= 200)
10484 {
10485 groupProfileReply.GroupData.OpenEnrollment = true;
10486 groupProfileReply.GroupData.MembershipFee = 0;
10487 }
10488 }
10489 }
10490
10256 OutPacket(groupProfileReply, ThrottleOutPacketType.Task); 10491 OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
10257 } 10492 }
10258 return true; 10493 return true;
@@ -10826,11 +11061,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10826 11061
10827 StartLure handlerStartLure = OnStartLure; 11062 StartLure handlerStartLure = OnStartLure;
10828 if (handlerStartLure != null) 11063 if (handlerStartLure != null)
10829 handlerStartLure(startLureRequest.Info.LureType, 11064 {
10830 Utils.BytesToString( 11065 for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
10831 startLureRequest.Info.Message), 11066 {
10832 startLureRequest.TargetData[0].TargetID, 11067 handlerStartLure(startLureRequest.Info.LureType,
10833 this); 11068 Utils.BytesToString(
11069 startLureRequest.Info.Message),
11070 startLureRequest.TargetData[i].TargetID,
11071 this);
11072 }
11073 }
10834 return true; 11074 return true;
10835 } 11075 }
10836 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) 11076 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -10944,10 +11184,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10944 } 11184 }
10945 #endregion 11185 #endregion
10946 11186
10947 ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; 11187 ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
10948 if (handlerClassifiedGodDelete != null) 11188 if (handlerClassifiedGodDelete != null)
10949 handlerClassifiedGodDelete( 11189 handlerClassifiedGodDelete(
10950 classifiedGodDelete.Data.ClassifiedID, 11190 classifiedGodDelete.Data.ClassifiedID,
11191 classifiedGodDelete.Data.QueryID,
10951 this); 11192 this);
10952 return true; 11193 return true;
10953 } 11194 }
@@ -11313,209 +11554,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11313 } 11554 }
11314 else 11555 else
11315 { 11556 {
11316// m_log.DebugFormat( 11557 ClientChangeObject updatehandler = onClientChangeObject;
11317// "[CLIENT]: Processing block {0} type {1} for {2} {3}",
11318// i, block.Type, part.Name, part.LocalId);
11319 11558
11320// // Do this once since fetch parts creates a new array. 11559 if (updatehandler != null)
11321// SceneObjectPart[] parts = part.ParentGroup.Parts; 11560 {
11322// for (int j = 0; j < parts.Length; j++) 11561 ObjectChangeData udata = new ObjectChangeData();
11323// {
11324// part.StoreUndoState();
11325// parts[j].IgnoreUndoUpdate = true;
11326// }
11327 11562
11328 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; 11563 /*ubit from ll JIRA:
11564 * 0x01 position
11565 * 0x02 rotation
11566 * 0x04 scale
11567
11568 * 0x08 LINK_SET
11569 * 0x10 UNIFORM for scale
11570 */
11329 11571
11330 switch (block.Type) 11572 // translate to internal changes
11331 { 11573 // not all cases .. just the ones older code did
11332 case 1:
11333 Vector3 pos1 = new Vector3(block.Data, 0);
11334 11574
11335 UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11575 switch (block.Type)
11336 if (handlerUpdatePrimSinglePosition != null) 11576 {
11337 { 11577 case 1: //change position sp
11338 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11578 udata.position = new Vector3(block.Data, 0);
11339 handlerUpdatePrimSinglePosition(localId, pos1, this);
11340 }
11341 break;
11342 11579
11343 case 2: 11580 udata.change = ObjectChangeType.primP;
11344 Quaternion rot1 = new Quaternion(block.Data, 0, true); 11581 updatehandler(localId, udata, this);
11582 break;
11345 11583
11346 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 11584 case 2: // rotation sp
11347 if (handlerUpdatePrimSingleRotation != null) 11585 udata.rotation = new Quaternion(block.Data, 0, true);
11348 {
11349 // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
11350 handlerUpdatePrimSingleRotation(localId, rot1, this);
11351 }
11352 break;
11353 11586
11354 case 3: 11587 udata.change = ObjectChangeType.primR;
11355 Vector3 rotPos = new Vector3(block.Data, 0); 11588 updatehandler(localId, udata, this);
11356 Quaternion rot2 = new Quaternion(block.Data, 12, true); 11589 break;
11357 11590
11358 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; 11591 case 3: // position plus rotation
11359 if (handlerUpdatePrimSingleRotationPosition != null) 11592 udata.position = new Vector3(block.Data, 0);
11360 { 11593 udata.rotation = new Quaternion(block.Data, 12, true);
11361 // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
11362 // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
11363 handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
11364 }
11365 break;
11366 11594
11367 case 4: 11595 udata.change = ObjectChangeType.primPR;
11368 case 20: 11596 updatehandler(localId, udata, this);
11369 Vector3 scale4 = new Vector3(block.Data, 0); 11597 break;
11370 11598
11371 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; 11599 case 4: // scale sp
11372 if (handlerUpdatePrimScale != null) 11600 udata.scale = new Vector3(block.Data, 0);
11373 { 11601 udata.change = ObjectChangeType.primS;
11374 // m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
11375 handlerUpdatePrimScale(localId, scale4, this);
11376 }
11377 break;
11378 11602
11379 case 5: 11603 updatehandler(localId, udata, this);
11380 Vector3 scale1 = new Vector3(block.Data, 12); 11604 break;
11381 Vector3 pos11 = new Vector3(block.Data, 0);
11382 11605
11383 handlerUpdatePrimScale = OnUpdatePrimScale; 11606 case 0x14: // uniform scale sp
11384 if (handlerUpdatePrimScale != null) 11607 udata.scale = new Vector3(block.Data, 0);
11385 {
11386 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11387 handlerUpdatePrimScale(localId, scale1, this);
11388 11608
11389 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11609 udata.change = ObjectChangeType.primUS;
11390 if (handlerUpdatePrimSinglePosition != null) 11610 updatehandler(localId, udata, this);
11391 { 11611 break;
11392 handlerUpdatePrimSinglePosition(localId, pos11, this);
11393 }
11394 }
11395 break;
11396 11612
11397 case 9: 11613 case 5: // scale and position sp
11398 Vector3 pos2 = new Vector3(block.Data, 0); 11614 udata.position = new Vector3(block.Data, 0);
11615 udata.scale = new Vector3(block.Data, 12);
11399 11616
11400 UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; 11617 udata.change = ObjectChangeType.primPS;
11618 updatehandler(localId, udata, this);
11619 break;
11401 11620
11402 if (handlerUpdateVector != null) 11621 case 0x15: //uniform scale and position
11403 { 11622 udata.position = new Vector3(block.Data, 0);
11404 handlerUpdateVector(localId, pos2, this); 11623 udata.scale = new Vector3(block.Data, 12);
11405 }
11406 break;
11407 11624
11408 case 10: 11625 udata.change = ObjectChangeType.primPUS;
11409 Quaternion rot3 = new Quaternion(block.Data, 0, true); 11626 updatehandler(localId, udata, this);
11627 break;
11410 11628
11411 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; 11629 // now group related (bit 4)
11412 if (handlerUpdatePrimRotation != null) 11630 case 9: //( 8 + 1 )group position
11413 { 11631 udata.position = new Vector3(block.Data, 0);
11414 // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
11415 handlerUpdatePrimRotation(localId, rot3, this);
11416 }
11417 break;
11418 11632
11419 case 11: 11633 udata.change = ObjectChangeType.groupP;
11420 Vector3 pos3 = new Vector3(block.Data, 0); 11634 updatehandler(localId, udata, this);
11421 Quaternion rot4 = new Quaternion(block.Data, 12, true); 11635 break;
11422 11636
11423 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 11637 case 0x0A: // (8 + 2) group rotation
11424 if (handlerUpdatePrimGroupRotation != null) 11638 udata.rotation = new Quaternion(block.Data, 0, true);
11425 {
11426 // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11427 // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
11428 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
11429 }
11430 break;
11431 case 12:
11432 case 28:
11433 Vector3 scale7 = new Vector3(block.Data, 0);
11434 11639
11435 UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11640 udata.change = ObjectChangeType.groupR;
11436 if (handlerUpdatePrimGroupScale != null) 11641 updatehandler(localId, udata, this);
11437 { 11642 break;
11438 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11439 handlerUpdatePrimGroupScale(localId, scale7, this);
11440 }
11441 break;
11442 11643
11443 case 13: 11644 case 0x0B: //( 8 + 2 + 1) group rotation and position
11444 Vector3 scale2 = new Vector3(block.Data, 12); 11645 udata.position = new Vector3(block.Data, 0);
11445 Vector3 pos4 = new Vector3(block.Data, 0); 11646 udata.rotation = new Quaternion(block.Data, 12, true);
11446 11647
11447 handlerUpdatePrimScale = OnUpdatePrimScale; 11648 udata.change = ObjectChangeType.groupPR;
11448 if (handlerUpdatePrimScale != null) 11649 updatehandler(localId, udata, this);
11449 { 11650 break;
11450 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11451 handlerUpdatePrimScale(localId, scale2, this);
11452 11651
11453 // Change the position based on scale (for bug number 246) 11652 case 0x0C: // (8 + 4) group scale
11454 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11653 // only afects root prim and only sent by viewer editor object tab scaling
11455 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11654 // mouse edition only allows uniform scaling
11456 if (handlerUpdatePrimSinglePosition != null) 11655 // SL MAY CHANGE THIS in viewers
11457 {
11458 handlerUpdatePrimSinglePosition(localId, pos4, this);
11459 }
11460 }
11461 break;
11462 11656
11463 case 29: 11657 udata.scale = new Vector3(block.Data, 0);
11464 Vector3 scale5 = new Vector3(block.Data, 12);
11465 Vector3 pos5 = new Vector3(block.Data, 0);
11466 11658
11467 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11659 udata.change = ObjectChangeType.groupS;
11468 if (handlerUpdatePrimGroupScale != null) 11660 updatehandler(localId, udata, this);
11469 {
11470 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11471 part.StoreUndoState(true);
11472 part.IgnoreUndoUpdate = true;
11473 handlerUpdatePrimGroupScale(localId, scale5, this);
11474 handlerUpdateVector = OnUpdatePrimGroupPosition;
11475 11661
11476 if (handlerUpdateVector != null) 11662 break;
11477 {
11478 handlerUpdateVector(localId, pos5, this);
11479 }
11480 11663
11481 part.IgnoreUndoUpdate = false; 11664 case 0x0D: //(8 + 4 + 1) group scale and position
11482 } 11665 // exception as above
11483 11666
11484 break; 11667 udata.position = new Vector3(block.Data, 0);
11668 udata.scale = new Vector3(block.Data, 12);
11485 11669
11486 case 21: 11670 udata.change = ObjectChangeType.groupPS;
11487 Vector3 scale6 = new Vector3(block.Data, 12); 11671 updatehandler(localId, udata, this);
11488 Vector3 pos6 = new Vector3(block.Data, 0); 11672 break;
11489 11673
11490 handlerUpdatePrimScale = OnUpdatePrimScale; 11674 case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
11491 if (handlerUpdatePrimScale != null) 11675 udata.scale = new Vector3(block.Data, 0);
11492 {
11493 part.StoreUndoState(false);
11494 part.IgnoreUndoUpdate = true;
11495 11676
11496 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 11677 udata.change = ObjectChangeType.groupUS;
11497 handlerUpdatePrimScale(localId, scale6, this); 11678 updatehandler(localId, udata, this);
11498 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11679 break;
11499 if (handlerUpdatePrimSinglePosition != null)
11500 {
11501 handlerUpdatePrimSinglePosition(localId, pos6, this);
11502 }
11503 11680
11504 part.IgnoreUndoUpdate = false; 11681 case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
11505 } 11682 udata.position = new Vector3(block.Data, 0);
11506 break; 11683 udata.scale = new Vector3(block.Data, 12);
11507 11684
11508 default: 11685 udata.change = ObjectChangeType.groupPUS;
11509 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); 11686 updatehandler(localId, udata, this);
11510 break; 11687 break;
11688
11689 default:
11690 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
11691 break;
11692 }
11511 } 11693 }
11512 11694
11513// for (int j = 0; j < parts.Length; j++)
11514// parts[j].IgnoreUndoUpdate = false;
11515 } 11695 }
11516 } 11696 }
11517 } 11697 }
11518
11519 return true; 11698 return true;
11520 } 11699 }
11521 11700
@@ -11974,7 +12153,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11974// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", 12153// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
11975// requestID, taskID, (SourceType)sourceType, Name); 12154// requestID, taskID, (SourceType)sourceType, Name);
11976 12155
12156
12157 //Note, the bool returned from the below function is useless since it is always false.
11977 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 12158 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
12159
11978 } 12160 }
11979 12161
11980 /// <summary> 12162 /// <summary>
@@ -12028,7 +12210,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12028 /// <returns></returns> 12210 /// <returns></returns>
12029 private static int CalculateNumPackets(byte[] data) 12211 private static int CalculateNumPackets(byte[] data)
12030 { 12212 {
12031 const uint m_maxPacketSize = 600; 12213// const uint m_maxPacketSize = 600;
12214 uint m_maxPacketSize = MaxTransferBytesPerPacket;
12032 int numPackets = 1; 12215 int numPackets = 1;
12033 12216
12034 if (data == null) 12217 if (data == null)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index ffa3be4..ae72175 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -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
@@ -439,6 +440,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
439 if (category >= 0 && category < m_packetOutboxes.Length) 440 if (category >= 0 && category < m_packetOutboxes.Length)
440 { 441 {
441 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 442 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
443
444 if (m_deliverPackets == false)
445 {
446 queue.Enqueue(packet);
447 return true;
448 }
449
442 TokenBucket bucket = m_throttleCategories[category]; 450 TokenBucket bucket = m_throttleCategories[category];
443 451
444 // 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
@@ -488,7 +496,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
488 /// <returns>True if any packets were sent, otherwise false</returns> 496 /// <returns>True if any packets were sent, otherwise false</returns>
489 public bool DequeueOutgoing() 497 public bool DequeueOutgoing()
490 { 498 {
491 OutgoingPacket packet; 499 if (m_deliverPackets == false) return false;
500
501 OutgoingPacket packet = null;
492 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 502 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
493 TokenBucket bucket; 503 TokenBucket bucket;
494 bool packetSent = false; 504 bool packetSent = false;
@@ -520,32 +530,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
520 // 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
521 // this queue 531 // this queue
522 queue = m_packetOutboxes[i]; 532 queue = m_packetOutboxes[i];
523 if (queue.Dequeue(out packet)) 533 if (queue != null)
524 { 534 {
525 // A packet was pulled off the queue. See if we have 535 bool success = false;
526 // enough tokens in the bucket to send it out 536 try
527 if (bucket.RemoveTokens(packet.Buffer.DataLength))
528 { 537 {
529 // Send the packet 538 success = queue.Dequeue(out packet);
530 m_udpServer.SendPacketFinal(packet);
531 packetSent = true;
532 } 539 }
533 else 540 catch
534 { 541 {
535 // Save the dequeued packet for the next iteration 542 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
536 m_nextPackets[i] = packet;
537 } 543 }
538 544 if (success)
539 // If the queue is empty after this dequeue, fire the queue 545 {
540 // empty callback now so it has a chance to fill before we 546 // A packet was pulled off the queue. See if we have
541 // get back here 547 // enough tokens in the bucket to send it out
542 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
543 emptyCategories |= CategoryToFlag(i); 570 emptyCategories |= CategoryToFlag(i);
571 }
544 } 572 }
545 else 573 else
546 { 574 {
547 // No packets in this queue. Fire the queue empty callback 575 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
548 // if it has not been called recently
549 emptyCategories |= CategoryToFlag(i); 576 emptyCategories |= CategoryToFlag(i);
550 } 577 }
551 } 578 }
@@ -703,4 +730,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
703 } 730 }
704 } 731 }
705 } 732 }
706} \ No newline at end of file 733}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index edf91cb..dda4444 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1053 if (m_scene.TryGetClient(udpClient.AgentID, out client)) 1053 if (m_scene.TryGetClient(udpClient.AgentID, out client))
1054 { 1054 {
1055 client.IsLoggingOut = true; 1055 client.IsLoggingOut = true;
1056 client.Close(); 1056 client.Close(false);
1057 } 1057 }
1058 } 1058 }
1059 1059
@@ -1065,6 +1065,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1065 1065
1066 while (base.IsRunning) 1066 while (base.IsRunning)
1067 { 1067 {
1068 m_scene.ThreadAlive(1);
1068 try 1069 try
1069 { 1070 {
1070 IncomingPacket incomingPacket = null; 1071 IncomingPacket incomingPacket = null;
@@ -1107,6 +1108,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1107 1108
1108 while (base.IsRunning) 1109 while (base.IsRunning)
1109 { 1110 {
1111 m_scene.ThreadAlive(2);
1110 try 1112 try
1111 { 1113 {
1112 m_packetSent = false; 1114 m_packetSent = false;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 039379d..cfe7c9d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -100,10 +100,6 @@ namespace OpenMetaverse
100 const int SIO_UDP_CONNRESET = -1744830452; 100 const int SIO_UDP_CONNRESET = -1744830452;
101 101
102 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort); 102 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
103
104 m_log.DebugFormat(
105 "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}",
106 ipep.Address, ipep.Port);
107 103
108 m_udpSocket = new Socket( 104 m_udpSocket = new Socket(
109 AddressFamily.InterNetwork, 105 AddressFamily.InterNetwork,
generated by cgit v1.1 at 2024-12-30 02:29:53 +0000