aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs158
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs10
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs20
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1193
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs65
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs80
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs4
8 files changed, 979 insertions, 554 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 185f9ce..88c4d7f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -96,7 +96,10 @@ namespace OpenSim.Region.ClientStack.Linden
96 // private static readonly string m_fetchInventoryPath = "0006/"; 96 // private static readonly string m_fetchInventoryPath = "0006/";
97 private static readonly string m_copyFromNotecardPath = "0007/"; 97 private static readonly string m_copyFromNotecardPath = "0007/";
98 // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. 98 // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
99 99 private static readonly string m_getObjectPhysicsDataPath = "0101/";
100 private static readonly string m_getObjectCostPath = "0102/";
101 private static readonly string m_ResourceCostSelectedPath = "0103/";
102
100 103
101 // These are callbacks which will be setup by the scene so that we can update scene data when we 104 // These are callbacks which will be setup by the scene so that we can update scene data when we
102 // receive capability calls 105 // receive capability calls
@@ -204,6 +207,14 @@ namespace OpenSim.Region.ClientStack.Linden
204 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); 207 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
205 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); 208 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
206 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); 209 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
210 IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData);
211 m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler);
212 IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost);
213 m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler);
214 IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected);
215 m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler);
216
217
207 218
208 m_HostCapsObj.RegisterHandler( 219 m_HostCapsObj.RegisterHandler(
209 "CopyInventoryFromNotecard", 220 "CopyInventoryFromNotecard",
@@ -854,6 +865,151 @@ namespace OpenSim.Region.ClientStack.Linden
854 response["int_response_code"] = 200; 865 response["int_response_code"] = 200;
855 return LLSDHelpers.SerialiseLLSDReply(response); 866 return LLSDHelpers.SerialiseLLSDReply(response);
856 } 867 }
868
869 public string GetObjectPhysicsData(string request, string path,
870 string param, IOSHttpRequest httpRequest,
871 IOSHttpResponse httpResponse)
872 {
873 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
874 OSDMap resp = new OSDMap();
875 OSDArray object_ids = (OSDArray)req["object_ids"];
876
877 for (int i = 0 ; i < object_ids.Count ; i++)
878 {
879 UUID uuid = object_ids[i].AsUUID();
880
881 SceneObjectPart obj = m_Scene.GetSceneObjectPart(uuid);
882 if (obj != null)
883 {
884 OSDMap object_data = new OSDMap();
885
886 object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
887 object_data["Density"] = obj.Density;
888 object_data["Friction"] = obj.Friction;
889 object_data["Restitution"] = obj.Bounciness;
890 object_data["GravityMultiplier"] = obj.GravityModifier;
891
892 resp[uuid.ToString()] = object_data;
893 }
894 }
895
896 string response = OSDParser.SerializeLLSDXmlString(resp);
897 return response;
898 }
899
900 public string GetObjectCost(string request, string path,
901 string param, IOSHttpRequest httpRequest,
902 IOSHttpResponse httpResponse)
903 {
904 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
905 OSDMap resp = new OSDMap();
906
907 OSDArray object_ids = (OSDArray)req["object_ids"];
908
909 for (int i = 0; i < object_ids.Count; i++)
910 {
911 UUID uuid = object_ids[i].AsUUID();
912
913 SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
914
915 if (part != null)
916 {
917 SceneObjectGroup grp = part.ParentGroup;
918 if (grp != null)
919 {
920 float linksetCost;
921 float linksetPhysCost;
922 float partCost;
923 float partPhysCost;
924
925 grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out partPhysCost);
926
927 OSDMap object_data = new OSDMap();
928 object_data["linked_set_resource_cost"] = linksetCost;
929 object_data["resource_cost"] = partCost;
930 object_data["physics_cost"] = partPhysCost;
931 object_data["linked_set_physics_cost"] = linksetPhysCost;
932
933 resp[uuid.ToString()] = object_data;
934 }
935 }
936 }
937
938 string response = OSDParser.SerializeLLSDXmlString(resp);
939 return response;
940 }
941
942 public string ResourceCostSelected(string request, string path,
943 string param, IOSHttpRequest httpRequest,
944 IOSHttpResponse httpResponse)
945 {
946 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
947 OSDMap resp = new OSDMap();
948
949
950 float phys=0;
951 float stream=0;
952 float simul=0;
953
954 if (req.ContainsKey("selected_roots"))
955 {
956 OSDArray object_ids = (OSDArray)req["selected_roots"];
957
958 // should go by SOG suming costs for all parts
959 // ll v3 works ok with several objects select we get the list and adds ok
960 // FS calls per object so results are wrong guess fs bug
961 for (int i = 0; i < object_ids.Count; i++)
962 {
963 UUID uuid = object_ids[i].AsUUID();
964 float Physc;
965 float simulc;
966 float streamc;
967
968 SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid);
969 if (grp != null)
970 {
971 grp.GetSelectedCosts(out Physc, out streamc, out simulc);
972 phys += Physc;
973 stream += streamc;
974 simul += simulc;
975 }
976 }
977 }
978 else if (req.ContainsKey("selected_prims"))
979 {
980 OSDArray object_ids = (OSDArray)req["selected_prims"];
981
982 // don't see in use in any of the 2 viewers
983 // guess it should be for edit linked but... nothing
984 // should go to SOP per part
985 for (int i = 0; i < object_ids.Count; i++)
986 {
987 UUID uuid = object_ids[i].AsUUID();
988
989 SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
990 if (part != null)
991 {
992 phys += part.PhysicsCost;
993 stream += part.StreamingCost;
994 simul += part.SimulationCost;
995 }
996 }
997 }
998
999 if (simul != 0)
1000 {
1001 OSDMap object_data = new OSDMap();
1002
1003 object_data["physics"] = phys;
1004 object_data["streaming"] = stream;
1005 object_data["simulation"] = simul;
1006
1007 resp["selected"] = object_data;
1008 }
1009
1010 string response = OSDParser.SerializeLLSDXmlString(resp);
1011 return response;
1012 }
857 } 1013 }
858 1014
859 public class AssetUploader 1015 public class AssetUploader
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 594b229..ebfe687 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
377 // TODO: Add EventQueueGet name/description for diagnostics 377 // TODO: Add EventQueueGet name/description for diagnostics
378 MainServer.Instance.AddPollServiceHTTPHandler( 378 MainServer.Instance.AddPollServiceHTTPHandler(
379 eventQueueGetPath, 379 eventQueueGetPath,
380 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); 380 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 1000));
381 381
382// m_log.DebugFormat( 382// m_log.DebugFormat(
383// "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", 383// "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
@@ -831,5 +831,13 @@ namespace OpenSim.Region.ClientStack.Linden
831 { 831 {
832 return EventQueueHelper.BuildEvent(eventName, eventBody); 832 return EventQueueHelper.BuildEvent(eventName, eventBody);
833 } 833 }
834
835 public void partPhysicsProperties(uint localID, byte physhapetype,
836 float density, float friction, float bounce, float gravmod,UUID avatarID)
837 {
838 OSD item = EventQueueHelper.partPhysicsProperties(localID, physhapetype,
839 density, friction, bounce, gravmod);
840 Enqueue(item, avatarID);
841 }
834 } 842 }
835} 843}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 3f49aba..b9222e3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -395,5 +395,25 @@ namespace OpenSim.Region.ClientStack.Linden
395 return message; 395 return message;
396 } 396 }
397 397
398 public static OSD partPhysicsProperties(uint localID, byte physhapetype,
399 float density, float friction, float bounce, float gravmod)
400 {
401
402 OSDMap physinfo = new OSDMap(6);
403 physinfo["LocalID"] = localID;
404 physinfo["Density"] = density;
405 physinfo["Friction"] = friction;
406 physinfo["GravityMultiplier"] = gravmod;
407 physinfo["Restitution"] = bounce;
408 physinfo["PhysicsShapeType"] = (int)physhapetype;
409
410 OSDArray array = new OSDArray(1);
411 array.Add(physinfo);
412
413 OSDMap llsdBody = new OSDMap(1);
414 llsdBody.Add("ObjectData", array);
415
416 return BuildEvent("ObjectPhysicsProperties", llsdBody);
417 }
398 } 418 }
399} 419}
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 01ceeed..8cac731 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,14 +343,15 @@ 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;
343 350
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;
@@ -380,6 +388,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
380 get { return m_startpos; } 388 get { return m_startpos; }
381 set { m_startpos = value; } 389 set { m_startpos = value; }
382 } 390 }
391 public bool DeliverPackets
392 {
393 get { return m_deliverPackets; }
394 set {
395 m_deliverPackets = value;
396 m_udpClient.m_deliverPackets = value;
397 }
398 }
383 public UUID AgentId { get { return m_agentId; } } 399 public UUID AgentId { get { return m_agentId; } }
384 public ISceneAgent SceneAgent { get; set; } 400 public ISceneAgent SceneAgent { get; set; }
385 public UUID ActiveGroupId { get { return m_activeGroupID; } } 401 public UUID ActiveGroupId { get { return m_activeGroupID; } }
@@ -457,7 +473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
457 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); 473 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
458 m_entityProps = new PriorityQueue(m_scene.Entities.Count); 474 m_entityProps = new PriorityQueue(m_scene.Entities.Count);
459 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); 475 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
460 m_killRecord = new HashSet<uint>(); 476// m_killRecord = new HashSet<uint>();
461// m_attachmentsSent = new HashSet<uint>(); 477// m_attachmentsSent = new HashSet<uint>();
462 478
463 m_assetService = m_scene.RequestModuleInterface<IAssetService>(); 479 m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -487,11 +503,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
487 503
488 #region Client Methods 504 #region Client Methods
489 505
506
490 /// <summary> 507 /// <summary>
491 /// Close down the client view 508 /// Close down the client view
492 /// </summary> 509 /// </summary>
493 public void Close() 510 public void Close()
494 { 511 {
512 Close(true);
513 }
514
515 /// <summary>
516 /// Shut down the client view
517 /// </summary>
518 public void Close(bool sendStop)
519 {
495 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. 520 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
496 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. 521 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
497 lock (CloseSyncLock) 522 lock (CloseSyncLock)
@@ -500,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
500 return; 525 return;
501 526
502 IsActive = false; 527 IsActive = false;
503 CloseWithoutChecks(); 528 CloseWithoutChecks(sendStop);
504 } 529 }
505 } 530 }
506 531
@@ -513,12 +538,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
513 /// 538 ///
514 /// Callers must lock ClosingSyncLock before calling. 539 /// Callers must lock ClosingSyncLock before calling.
515 /// </remarks> 540 /// </remarks>
516 public void CloseWithoutChecks() 541 public void CloseWithoutChecks(bool sendStop)
517 { 542 {
518 m_log.DebugFormat( 543 m_log.DebugFormat(
519 "[CLIENT]: Close has been called for {0} attached to scene {1}", 544 "[CLIENT]: Close has been called for {0} attached to scene {1}",
520 Name, m_scene.RegionInfo.RegionName); 545 Name, m_scene.RegionInfo.RegionName);
521 546
547 if (sendStop)
548 {
549 // Send the STOP packet
550 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
551 OutPacket(disable, ThrottleOutPacketType.Unknown);
552 }
553
522 // Shutdown the image manager 554 // Shutdown the image manager
523 ImageManager.Close(); 555 ImageManager.Close();
524 556
@@ -815,7 +847,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
815 reply.ChatData.OwnerID = fromAgentID; 847 reply.ChatData.OwnerID = fromAgentID;
816 reply.ChatData.SourceID = fromAgentID; 848 reply.ChatData.SourceID = fromAgentID;
817 849
818 OutPacket(reply, ThrottleOutPacketType.Task); 850 OutPacket(reply, ThrottleOutPacketType.Unknown);
819 } 851 }
820 852
821 /// <summary> 853 /// <summary>
@@ -1101,6 +1133,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1101 public virtual void SendLayerData(float[] map) 1133 public virtual void SendLayerData(float[] map)
1102 { 1134 {
1103 Util.FireAndForget(DoSendLayerData, map); 1135 Util.FireAndForget(DoSendLayerData, map);
1136
1137 // Send it sync, and async. It's not that much data
1138 // and it improves user experience just so much!
1139 DoSendLayerData(map);
1104 } 1140 }
1105 1141
1106 /// <summary> 1142 /// <summary>
@@ -1113,16 +1149,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1113 1149
1114 try 1150 try
1115 { 1151 {
1116 //for (int y = 0; y < 16; y++) 1152 for (int y = 0; y < 16; y++)
1117 //{ 1153 {
1118 // for (int x = 0; x < 16; x++) 1154 for (int x = 0; x < 16; x+=4)
1119 // { 1155 {
1120 // SendLayerData(x, y, map); 1156 SendLayerPacket(x, y, map);
1121 // } 1157 }
1122 //} 1158 }
1123
1124 // Send LayerData in a spiral pattern. Fun!
1125 SendLayerTopRight(map, 0, 0, 15, 15);
1126 } 1159 }
1127 catch (Exception e) 1160 catch (Exception e)
1128 { 1161 {
@@ -1130,51 +1163,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1130 } 1163 }
1131 } 1164 }
1132 1165
1133 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1134 {
1135 // Row
1136 for (int i = x1; i <= x2; i++)
1137 SendLayerData(i, y1, map);
1138
1139 // Column
1140 for (int j = y1 + 1; j <= y2; j++)
1141 SendLayerData(x2, j, map);
1142
1143 if (x2 - x1 > 0)
1144 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1145 }
1146
1147 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1148 {
1149 // Row in reverse
1150 for (int i = x2; i >= x1; i--)
1151 SendLayerData(i, y2, map);
1152
1153 // Column in reverse
1154 for (int j = y2 - 1; j >= y1; j--)
1155 SendLayerData(x1, j, map);
1156
1157 if (x2 - x1 > 0)
1158 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1159 }
1160
1161 /// <summary> 1166 /// <summary>
1162 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1167 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1163 /// </summary> 1168 /// </summary>
1164 /// <param name="map">heightmap</param> 1169 /// <param name="map">heightmap</param>
1165 /// <param name="px">X coordinate for patches 0..12</param> 1170 /// <param name="px">X coordinate for patches 0..12</param>
1166 /// <param name="py">Y coordinate for patches 0..15</param> 1171 /// <param name="py">Y coordinate for patches 0..15</param>
1167 // private void SendLayerPacket(float[] map, int y, int x) 1172 private void SendLayerPacket(int x, int y, float[] map)
1168 // { 1173 {
1169 // int[] patches = new int[4]; 1174 int[] patches = new int[4];
1170 // patches[0] = x + 0 + y * 16; 1175 patches[0] = x + 0 + y * 16;
1171 // patches[1] = x + 1 + y * 16; 1176 patches[1] = x + 1 + y * 16;
1172 // patches[2] = x + 2 + y * 16; 1177 patches[2] = x + 2 + y * 16;
1173 // patches[3] = x + 3 + y * 16; 1178 patches[3] = x + 3 + y * 16;
1174 1179
1175 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1180 float[] heightmap = (map.Length == 65536) ?
1176 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1181 map :
1177 // } 1182 LLHeightFieldMoronize(map);
1183
1184 try
1185 {
1186 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1187 OutPacket(layerpack, ThrottleOutPacketType.Land);
1188 }
1189 catch
1190 {
1191 for (int px = x ; px < x + 4 ; px++)
1192 SendLayerData(px, y, map);
1193 }
1194 }
1178 1195
1179 /// <summary> 1196 /// <summary>
1180 /// Sends a specified patch to a client 1197 /// Sends a specified patch to a client
@@ -1194,7 +1211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1194 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1211 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1195 layerpack.Header.Reliable = true; 1212 layerpack.Header.Reliable = true;
1196 1213
1197 OutPacket(layerpack, ThrottleOutPacketType.Land); 1214 OutPacket(layerpack, ThrottleOutPacketType.Task);
1198 } 1215 }
1199 catch (Exception e) 1216 catch (Exception e)
1200 { 1217 {
@@ -1557,7 +1574,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1557 1574
1558 public void SendKillObject(ulong regionHandle, List<uint> localIDs) 1575 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1559 { 1576 {
1560// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1577// foreach (uint id in localIDs)
1578// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1561 1579
1562 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1580 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1563 // TODO: don't create new blocks if recycling an old packet 1581 // TODO: don't create new blocks if recycling an old packet
@@ -1579,17 +1597,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1579 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race 1597 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
1580 // condition where a kill can be processed before an out-of-date update for the same object. 1598 // condition where a kill can be processed before an out-of-date update for the same object.
1581 // ProcessEntityUpdates() also takes the m_killRecord lock. 1599 // ProcessEntityUpdates() also takes the m_killRecord lock.
1582 lock (m_killRecord) 1600// lock (m_killRecord)
1583 { 1601// {
1584 foreach (uint localID in localIDs) 1602// foreach (uint localID in localIDs)
1585 m_killRecord.Add(localID); 1603// m_killRecord.Add(localID);
1586 1604
1587 // The throttle queue used here must match that being used for updates. Otherwise, there is a 1605 // The throttle queue used here must match that being used for updates. Otherwise, there is a
1588 // chance that a kill packet put on a separate queue will be sent to the client before an existing 1606 // chance that a kill packet put on a separate queue will be sent to the client before an existing
1589 // update packet on another queue. Receiving updates after kills results in unowned and undeletable 1607 // update packet on another queue. Receiving updates after kills results in unowned and undeletable
1590 // scene objects in a viewer until that viewer is relogged in. 1608 // scene objects in a viewer until that viewer is relogged in.
1591 OutPacket(kill, ThrottleOutPacketType.Task); 1609 OutPacket(kill, ThrottleOutPacketType.Task);
1592 } 1610// }
1593 } 1611 }
1594 } 1612 }
1595 1613
@@ -2128,16 +2146,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2128 replytask.InventoryData.TaskID = taskID; 2146 replytask.InventoryData.TaskID = taskID;
2129 replytask.InventoryData.Serial = serial; 2147 replytask.InventoryData.Serial = serial;
2130 replytask.InventoryData.Filename = fileName; 2148 replytask.InventoryData.Filename = fileName;
2131 OutPacket(replytask, ThrottleOutPacketType.Asset); 2149 OutPacket(replytask, ThrottleOutPacketType.Task);
2132 } 2150 }
2133 2151
2134 public void SendXferPacket(ulong xferID, uint packet, byte[] data) 2152 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
2135 { 2153 {
2154 ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
2155 if (isTaskInventory)
2156 type = ThrottleOutPacketType.Task;
2157
2136 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); 2158 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
2137 sendXfer.XferID.ID = xferID; 2159 sendXfer.XferID.ID = xferID;
2138 sendXfer.XferID.Packet = packet; 2160 sendXfer.XferID.Packet = packet;
2139 sendXfer.DataPacket.Data = data; 2161 sendXfer.DataPacket.Data = data;
2140 OutPacket(sendXfer, ThrottleOutPacketType.Asset); 2162 OutPacket(sendXfer, type);
2141 } 2163 }
2142 2164
2143 public void SendAbortXferPacket(ulong xferID) 2165 public void SendAbortXferPacket(ulong xferID)
@@ -2319,6 +2341,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2319 OutPacket(sound, ThrottleOutPacketType.Task); 2341 OutPacket(sound, ThrottleOutPacketType.Task);
2320 } 2342 }
2321 2343
2344 public void SendTransferAbort(TransferRequestPacket transferRequest)
2345 {
2346 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2347 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2348 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2349 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2350 OutPacket(abort, ThrottleOutPacketType.Task);
2351 }
2352
2322 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2353 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2323 { 2354 {
2324 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2355 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2611,6 +2642,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2611 } 2642 }
2612 } 2643 }
2613 2644
2645 public void SendPartPhysicsProprieties(ISceneEntity entity)
2646 {
2647 SceneObjectPart part = (SceneObjectPart)entity;
2648 if (part != null && AgentId != UUID.Zero)
2649 {
2650 try
2651 {
2652 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
2653 if (eq != null)
2654 {
2655 uint localid = part.LocalId;
2656 byte physshapetype = part.PhysicsShapeType;
2657 float density = part.Density;
2658 float friction = part.Friction;
2659 float bounce = part.Bounciness;
2660 float gravmod = part.GravityModifier;
2661
2662 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
2663 }
2664 }
2665 catch (Exception ex)
2666 {
2667 m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
2668 }
2669 part.UpdatePhysRequired = false;
2670 }
2671 }
2672
2673
2614 2674
2615 public void SendGroupNameReply(UUID groupLLUID, string GroupName) 2675 public void SendGroupNameReply(UUID groupLLUID, string GroupName)
2616 { 2676 {
@@ -2708,7 +2768,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2708 else 2768 else
2709 { 2769 {
2710 int processedLength = 0; 2770 int processedLength = 0;
2711 int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; 2771// int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
2772
2773 int maxChunkSize = (int) MaxTransferBytesPerPacket;
2712 int packetNumber = 0; 2774 int packetNumber = 0;
2713 2775
2714 while (processedLength < req.AssetInf.Data.Length) 2776 while (processedLength < req.AssetInf.Data.Length)
@@ -2779,7 +2841,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2779 reply.Data.ParcelID = parcelID; 2841 reply.Data.ParcelID = parcelID;
2780 reply.Data.OwnerID = land.OwnerID; 2842 reply.Data.OwnerID = land.OwnerID;
2781 reply.Data.Name = Utils.StringToBytes(land.Name); 2843 reply.Data.Name = Utils.StringToBytes(land.Name);
2782 reply.Data.Desc = Utils.StringToBytes(land.Description); 2844 if (land != null && land.Description != null && land.Description != String.Empty)
2845 reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
2846 else
2847 reply.Data.Desc = new Byte[0];
2783 reply.Data.ActualArea = land.Area; 2848 reply.Data.ActualArea = land.Area;
2784 reply.Data.BillableArea = land.Area; // TODO: what is this? 2849 reply.Data.BillableArea = land.Area; // TODO: what is this?
2785 2850
@@ -3514,7 +3579,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3514 3579
3515 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); 3580 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
3516 // TODO: don't create new blocks if recycling an old packet 3581 // TODO: don't create new blocks if recycling an old packet
3517 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 3582 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
3518 avp.ObjectData.TextureEntry = textureEntry; 3583 avp.ObjectData.TextureEntry = textureEntry;
3519 3584
3520 AvatarAppearancePacket.VisualParamBlock avblock = null; 3585 AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3644,7 +3709,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3644 /// </summary> 3709 /// </summary>
3645 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3710 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3646 { 3711 {
3647 //double priority = m_prioritizer.GetUpdatePriority(this, entity); 3712 if (entity is SceneObjectPart)
3713 {
3714 SceneObjectPart e = (SceneObjectPart)entity;
3715 SceneObjectGroup g = e.ParentGroup;
3716 if (g.RootPart.Shape.State > 30) // HUD
3717 if (g.OwnerID != AgentId)
3718 return; // Don't send updates for other people's HUDs
3719 }
3720
3648 uint priority = m_prioritizer.GetUpdatePriority(this, entity); 3721 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3649 3722
3650 lock (m_entityUpdates.SyncRoot) 3723 lock (m_entityUpdates.SyncRoot)
@@ -3711,27 +3784,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3711 3784
3712 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race 3785 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
3713 // condition where a kill can be processed before an out-of-date update for the same object. 3786 // condition where a kill can be processed before an out-of-date update for the same object.
3714 lock (m_killRecord) 3787 float avgTimeDilation = 1.0f;
3788 IEntityUpdate iupdate;
3789 Int32 timeinqueue; // this is just debugging code & can be dropped later
3790
3791 while (updatesThisCall < maxUpdates)
3715 { 3792 {
3716 float avgTimeDilation = 1.0f; 3793 lock (m_entityUpdates.SyncRoot)
3717 IEntityUpdate iupdate; 3794 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3718 Int32 timeinqueue; // this is just debugging code & can be dropped later 3795 break;
3796
3797 EntityUpdate update = (EntityUpdate)iupdate;
3798
3799 avgTimeDilation += update.TimeDilation;
3800 avgTimeDilation *= 0.5f;
3719 3801
3720 while (updatesThisCall < maxUpdates) 3802 if (update.Entity is SceneObjectPart)
3721 { 3803 {
3722 lock (m_entityUpdates.SyncRoot) 3804 SceneObjectPart part = (SceneObjectPart)update.Entity;
3723 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3724 break;
3725 3805
3726 EntityUpdate update = (EntityUpdate)iupdate; 3806 if (part.ParentGroup.IsDeleted)
3727 3807 continue;
3728 avgTimeDilation += update.TimeDilation;
3729 avgTimeDilation *= 0.5f;
3730 3808
3731 if (update.Entity is SceneObjectPart) 3809 if (part.ParentGroup.IsAttachment)
3810 { // Someone else's HUD, why are we getting these?
3811 if (part.ParentGroup.OwnerID != AgentId &&
3812 part.ParentGroup.RootPart.Shape.State >= 30)
3813 continue;
3814 ScenePresence sp;
3815 // Owner is not in the sim, don't update it to
3816 // anyone
3817 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
3818 continue;
3819
3820 List<SceneObjectGroup> atts = sp.GetAttachments();
3821 bool found = false;
3822 foreach (SceneObjectGroup att in atts)
3823 {
3824 if (att == part.ParentGroup)
3825 {
3826 found = true;
3827 break;
3828 }
3829 }
3830
3831 // It's an attachment of a valid avatar, but
3832 // doesn't seem to be attached, skip
3833 if (!found)
3834 continue;
3835
3836 // On vehicle crossing, the attachments are received
3837 // while the avatar is still a child. Don't send
3838 // updates here because the LocalId has not yet
3839 // been updated and the viewer will derender the
3840 // attachments until the avatar becomes root.
3841 if (sp.IsChildAgent)
3842 continue;
3843
3844 // If the object is an attachment we don't want it to be in the kill
3845 // record. Else attaching from inworld and subsequently dropping
3846 // it will no longer work.
3847// lock (m_killRecord)
3848// {
3849// m_killRecord.Remove(part.LocalId);
3850// m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
3851// }
3852 }
3853 else
3732 { 3854 {
3733 SceneObjectPart part = (SceneObjectPart)update.Entity;
3734
3735 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client 3855 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
3736 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good 3856 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good
3737 // safety measure. 3857 // safety measure.
@@ -3742,236 +3862,174 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3742 // 3862 //
3743 // This doesn't appear to apply to child prims - a client will happily ignore these updates 3863 // This doesn't appear to apply to child prims - a client will happily ignore these updates
3744 // after the root prim has been deleted. 3864 // after the root prim has been deleted.
3745 if (m_killRecord.Contains(part.LocalId)) 3865 //
3746 { 3866 // We ignore this for attachments because attaching something from inworld breaks unless we do.
3747 // m_log.WarnFormat( 3867// lock (m_killRecord)
3748 // "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted", 3868// {
3749 // part.LocalId, Name); 3869// if (m_killRecord.Contains(part.LocalId))
3750 continue; 3870// continue;
3751 } 3871// if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3752 3872// continue;
3753 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3873// }
3874 }
3875
3876 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3877 {
3878 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
3879 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3754 { 3880 {
3755 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && 3881 part.Shape.LightEntry = false;
3756 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3757 {
3758 part.Shape.LightEntry = false;
3759 }
3760 } 3882 }
3761 } 3883 }
3762 3884 }
3763 #region UpdateFlags to packet type conversion 3885
3764 3886 ++updatesThisCall;
3765 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags; 3887
3766 3888 #region UpdateFlags to packet type conversion
3767 bool canUseCompressed = true; 3889
3768 bool canUseImproved = true; 3890 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
3769 3891
3770 // Compressed object updates only make sense for LL primitives 3892 bool canUseCompressed = true;
3771 if (!(update.Entity is SceneObjectPart)) 3893 bool canUseImproved = true;
3894
3895 // Compressed object updates only make sense for LL primitives
3896 if (!(update.Entity is SceneObjectPart))
3897 {
3898 canUseCompressed = false;
3899 }
3900
3901 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3902 {
3903 canUseCompressed = false;
3904 canUseImproved = false;
3905 }
3906 else
3907 {
3908 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3909 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3910 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3911 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3772 { 3912 {
3773 canUseCompressed = false; 3913 canUseCompressed = false;
3774 } 3914 }
3775 3915
3776 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) 3916 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3917 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3918 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3919 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3920 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3921 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3922 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3923 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3924 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3925 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3926 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3927 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3928 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3929 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3777 { 3930 {
3778 canUseCompressed = false;
3779 canUseImproved = false; 3931 canUseImproved = false;
3780 } 3932 }
3781 else 3933 }
3782 {
3783 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3784 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3785 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3786 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3787 {
3788 canUseCompressed = false;
3789 }
3790
3791 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3792 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3793 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3794 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3795 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3796 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3797 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3798 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3799 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3800 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3801 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3802 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3803 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3804 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3805 {
3806 canUseImproved = false;
3807 }
3808 }
3809
3810 #endregion UpdateFlags to packet type conversion
3811
3812 #region Block Construction
3813
3814 // TODO: Remove this once we can build compressed updates
3815 canUseCompressed = false;
3816 3934
3817 if (!canUseImproved && !canUseCompressed) 3935 #endregion UpdateFlags to packet type conversion
3818 {
3819 ObjectUpdatePacket.ObjectDataBlock updateBlock;
3820 3936
3821 if (update.Entity is ScenePresence) 3937 #region Block Construction
3822 {
3823 updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
3824 }
3825 else
3826 {
3827 SceneObjectPart part = (SceneObjectPart)update.Entity;
3828 updateBlock = CreatePrimUpdateBlock(part, AgentId);
3829
3830 // If the part has become a private hud since the update was scheduled then we do not
3831 // want to send it to other avatars.
3832 if (part.ParentGroup.IsAttachment
3833 && part.ParentGroup.HasPrivateAttachmentPoint
3834 && part.ParentGroup.AttachedAvatar != AgentId)
3835 continue;
3836
3837 // If the part has since been deleted, then drop the update. In the case of attachments,
3838 // this is to avoid spurious updates to other viewers since post-processing of attachments
3839 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3840 // of the test above).
3841 //
3842 // Actual deletions (kills) happen in another method.
3843 if (part.ParentGroup.IsDeleted)
3844 continue;
3845 }
3846 3938
3847 objectUpdateBlocks.Value.Add(updateBlock); 3939 // TODO: Remove this once we can build compressed updates
3848 objectUpdates.Value.Add(update); 3940 canUseCompressed = false;
3849 }
3850 else if (!canUseImproved)
3851 {
3852 SceneObjectPart part = (SceneObjectPart)update.Entity;
3853 ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
3854 = CreateCompressedUpdateBlock(part, updateFlags);
3855
3856 // If the part has since been deleted, then drop the update. In the case of attachments,
3857 // this is to avoid spurious updates to other viewers since post-processing of attachments
3858 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3859 // of the test above).
3860 //
3861 // Actual deletions (kills) happen in another method.
3862 if (part.ParentGroup.IsDeleted)
3863 continue;
3864 3941
3865 compressedUpdateBlocks.Value.Add(compressedBlock); 3942 if (!canUseImproved && !canUseCompressed)
3866 compressedUpdates.Value.Add(update); 3943 {
3944 if (update.Entity is ScenePresence)
3945 {
3946 objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
3867 } 3947 }
3868 else 3948 else
3869 { 3949 {
3870 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) 3950 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
3871 {
3872 // Self updates go into a special list
3873 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3874 terseAgentUpdates.Value.Add(update);
3875 }
3876 else
3877 {
3878 ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
3879 = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
3880
3881 // Everything else goes here
3882 if (update.Entity is SceneObjectPart)
3883 {
3884 SceneObjectPart part = (SceneObjectPart)update.Entity;
3885
3886 // If the part has become a private hud since the update was scheduled then we do not
3887 // want to send it to other avatars.
3888 if (part.ParentGroup.IsAttachment
3889 && part.ParentGroup.HasPrivateAttachmentPoint
3890 && part.ParentGroup.AttachedAvatar != AgentId)
3891 continue;
3892
3893 // If the part has since been deleted, then drop the update. In the case of attachments,
3894 // this is to avoid spurious updates to other viewers since post-processing of attachments
3895 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3896 // of the test above).
3897 //
3898 // Actual deletions (kills) happen in another method.
3899 if (part.ParentGroup.IsDeleted)
3900 continue;
3901 }
3902
3903 terseUpdateBlocks.Value.Add(terseUpdateBlock);
3904 terseUpdates.Value.Add(update);
3905 }
3906 } 3951 }
3952 }
3953 else if (!canUseImproved)
3954 {
3955 compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
3956 }
3957 else
3958 {
3959 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
3960 // Self updates go into a special list
3961 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3962 else
3963 // Everything else goes here
3964 terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3965 }
3966
3967 #endregion Block Construction
3968 }
3907 3969
3908 ++updatesThisCall; 3970 #region Packet Sending
3909 3971
3910 #endregion Block Construction 3972 const float TIME_DILATION = 1.0f;
3911 } 3973 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
3912 3974
3913 #region Packet Sending 3975 if (terseAgentUpdateBlocks.IsValueCreated)
3914 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); 3976 {
3977 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
3915 3978
3916 if (terseAgentUpdateBlocks.IsValueCreated) 3979 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3917 { 3980 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3918 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value; 3981 packet.RegionData.TimeDilation = timeDilation;
3982 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3919 3983
3920 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket(); 3984 for (int i = 0; i < blocks.Count; i++)
3921 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3985 packet.ObjectData[i] = blocks[i];
3922 packet.RegionData.TimeDilation = timeDilation;
3923 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3924 3986
3925 for (int i = 0; i < blocks.Count; i++) 3987 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3926 packet.ObjectData[i] = blocks[i]; 3988 }
3927 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3928 OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
3929 }
3930 3989
3931 if (objectUpdateBlocks.IsValueCreated) 3990 if (objectUpdateBlocks.IsValueCreated)
3932 { 3991 {
3933 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value; 3992 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
3934 3993
3935 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); 3994 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
3936 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3995 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3937 packet.RegionData.TimeDilation = timeDilation; 3996 packet.RegionData.TimeDilation = timeDilation;
3938 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 3997 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3939 3998
3940 for (int i = 0; i < blocks.Count; i++) 3999 for (int i = 0; i < blocks.Count; i++)
3941 packet.ObjectData[i] = blocks[i]; 4000 packet.ObjectData[i] = blocks[i];
3942 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 4001
3943 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); }); 4002 OutPacket(packet, ThrottleOutPacketType.Task, true);
3944 } 4003 }
3945 4004
3946 if (compressedUpdateBlocks.IsValueCreated) 4005 if (compressedUpdateBlocks.IsValueCreated)
3947 { 4006 {
3948 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value; 4007 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
3949 4008
3950 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed); 4009 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
3951 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 4010 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3952 packet.RegionData.TimeDilation = timeDilation; 4011 packet.RegionData.TimeDilation = timeDilation;
3953 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count]; 4012 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
3954
3955 for (int i = 0; i < blocks.Count; i++)
3956 packet.ObjectData[i] = blocks[i];
3957 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3958 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
3959 }
3960 4013
3961 if (terseUpdateBlocks.IsValueCreated) 4014 for (int i = 0; i < blocks.Count; i++)
3962 { 4015 packet.ObjectData[i] = blocks[i];
3963 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value; 4016
3964 4017 OutPacket(packet, ThrottleOutPacketType.Task, true);
3965 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket(); 4018 }
3966 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 4019
3967 packet.RegionData.TimeDilation = timeDilation; 4020 if (terseUpdateBlocks.IsValueCreated)
3968 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 4021 {
3969 4022 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
3970 for (int i = 0; i < blocks.Count; i++) 4023
3971 packet.ObjectData[i] = blocks[i]; 4024 ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
3972 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 4025 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3973 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); 4026 packet.RegionData.TimeDilation = timeDilation;
3974 } 4027 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
4028
4029 for (int i = 0; i < blocks.Count; i++)
4030 packet.ObjectData[i] = blocks[i];
4031
4032 OutPacket(packet, ThrottleOutPacketType.Task, true);
3975 } 4033 }
3976 4034
3977 #endregion Packet Sending 4035 #endregion Packet Sending
@@ -4264,11 +4322,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4264 4322
4265 // Pass in the delegate so that if this packet needs to be resent, we send the current properties 4323 // Pass in the delegate so that if this packet needs to be resent, we send the current properties
4266 // of the object rather than the properties when the packet was created 4324 // of the object rather than the properties when the packet was created
4267 OutPacket(packet, ThrottleOutPacketType.Task, true, 4325 // HACK : Remove intelligent resending until it's fixed in core
4268 delegate(OutgoingPacket oPacket) 4326 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4269 { 4327 // delegate(OutgoingPacket oPacket)
4270 ResendPropertyUpdates(updates, oPacket); 4328 // {
4271 }); 4329 // ResendPropertyUpdates(updates, oPacket);
4330 // });
4331 OutPacket(packet, ThrottleOutPacketType.Task, true);
4272 4332
4273 // pbcnt += blocks.Count; 4333 // pbcnt += blocks.Count;
4274 // ppcnt++; 4334 // ppcnt++;
@@ -4294,11 +4354,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4294 // of the object rather than the properties when the packet was created 4354 // of the object rather than the properties when the packet was created
4295 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); 4355 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
4296 updates.Add(familyUpdates.Value[i]); 4356 updates.Add(familyUpdates.Value[i]);
4297 OutPacket(packet, ThrottleOutPacketType.Task, true, 4357 // HACK : Remove intelligent resending until it's fixed in core
4298 delegate(OutgoingPacket oPacket) 4358 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4299 { 4359 // delegate(OutgoingPacket oPacket)
4300 ResendPropertyUpdates(updates, oPacket); 4360 // {
4301 }); 4361 // ResendPropertyUpdates(updates, oPacket);
4362 // });
4363 OutPacket(packet, ThrottleOutPacketType.Task, true);
4302 4364
4303 // fpcnt++; 4365 // fpcnt++;
4304 // fbcnt++; 4366 // fbcnt++;
@@ -4447,37 +4509,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4447 if (bl[i].BannedUserID == UUID.Zero) 4509 if (bl[i].BannedUserID == UUID.Zero)
4448 continue; 4510 continue;
4449 BannedUsers.Add(bl[i].BannedUserID); 4511 BannedUsers.Add(bl[i].BannedUserID);
4450 }
4451 4512
4452 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 4513 if (BannedUsers.Count >= 50 || (i == (bl.Length - 1) && BannedUsers.Count > 0))
4453 packet.AgentData.TransactionID = UUID.Random(); 4514 {
4454 packet.AgentData.AgentID = AgentId; 4515 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
4455 packet.AgentData.SessionID = SessionId; 4516 packet.AgentData.TransactionID = UUID.Random();
4456 packet.MethodData.Invoice = invoice; 4517 packet.AgentData.AgentID = AgentId;
4457 packet.MethodData.Method = Utils.StringToBytes("setaccess"); 4518 packet.AgentData.SessionID = SessionId;
4519 packet.MethodData.Invoice = invoice;
4520 packet.MethodData.Method = Utils.StringToBytes("setaccess");
4458 4521
4459 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + BannedUsers.Count]; 4522 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + BannedUsers.Count];
4460 4523
4461 for (int i = 0; i < (6 + BannedUsers.Count); i++) 4524 int j;
4462 { 4525 for (j = 0; j < (6 + BannedUsers.Count); j++)
4463 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock(); 4526 {
4464 } 4527 returnblock[j] = new EstateOwnerMessagePacket.ParamListBlock();
4465 int j = 0; 4528 }
4529 j = 0;
4466 4530
4467 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++; 4531 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++;
4468 returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++; 4532 returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++;
4469 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4533 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4470 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4534 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4471 returnblock[j].Parameter = Utils.StringToBytes(BannedUsers.Count.ToString()); j++; 4535 returnblock[j].Parameter = Utils.StringToBytes(BannedUsers.Count.ToString()); j++;
4472 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 4536 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
4473 4537
4474 foreach (UUID banned in BannedUsers) 4538 foreach (UUID banned in BannedUsers)
4475 { 4539 {
4476 returnblock[j].Parameter = banned.GetBytes(); j++; 4540 returnblock[j].Parameter = banned.GetBytes(); j++;
4541 }
4542 packet.ParamList = returnblock;
4543 packet.Header.Reliable = true;
4544 OutPacket(packet, ThrottleOutPacketType.Task);
4545
4546 BannedUsers.Clear();
4547 }
4477 } 4548 }
4478 packet.ParamList = returnblock; 4549
4479 packet.Header.Reliable = false;
4480 OutPacket(packet, ThrottleOutPacketType.Task);
4481 } 4550 }
4482 4551
4483 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) 4552 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
@@ -4663,7 +4732,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4663 4732
4664 if (landData.SimwideArea > 0) 4733 if (landData.SimwideArea > 0)
4665 { 4734 {
4666 int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); 4735 int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
4736 // Never report more than sim total capacity
4737 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
4738 simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
4667 updateMessage.SimWideMaxPrims = simulatorCapacity; 4739 updateMessage.SimWideMaxPrims = simulatorCapacity;
4668 } 4740 }
4669 else 4741 else
@@ -4792,14 +4864,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4792 4864
4793 if (notifyCount > 0) 4865 if (notifyCount > 0)
4794 { 4866 {
4795 if (notifyCount > 32) 4867// if (notifyCount > 32)
4796 { 4868// {
4797 m_log.InfoFormat( 4869// m_log.InfoFormat(
4798 "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" 4870// "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}"
4799 + " - a developer might want to investigate whether this is a hard limit", 32); 4871// + " - a developer might want to investigate whether this is a hard limit", 32);
4800 4872//
4801 notifyCount = 32; 4873// notifyCount = 32;
4802 } 4874// }
4803 4875
4804 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock 4876 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
4805 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; 4877 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -4854,9 +4926,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4854 { 4926 {
4855 ScenePresence presence = (ScenePresence)entity; 4927 ScenePresence presence = (ScenePresence)entity;
4856 4928
4929 position = presence.OffsetPosition;
4930 rotation = presence.Rotation;
4931
4932 if (presence.ParentID != 0)
4933 {
4934 SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
4935 if (part != null && part != part.ParentGroup.RootPart)
4936 {
4937 position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
4938 rotation = part.RotationOffset * presence.Rotation;
4939 }
4940 }
4941
4857 attachPoint = 0; 4942 attachPoint = 0;
4858 collisionPlane = presence.CollisionPlane; 4943 collisionPlane = presence.CollisionPlane;
4859 position = presence.OffsetPosition;
4860 velocity = presence.Velocity; 4944 velocity = presence.Velocity;
4861 acceleration = Vector3.Zero; 4945 acceleration = Vector3.Zero;
4862 4946
@@ -4866,7 +4950,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4866// acceleration = new Vector3(1, 0, 0); 4950// acceleration = new Vector3(1, 0, 0);
4867 4951
4868 angularVelocity = Vector3.Zero; 4952 angularVelocity = Vector3.Zero;
4869 rotation = presence.Rotation;
4870 4953
4871 if (sendTexture) 4954 if (sendTexture)
4872 textureEntry = presence.Appearance.Texture.GetBytes(); 4955 textureEntry = presence.Appearance.Texture.GetBytes();
@@ -4971,13 +5054,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4971 5054
4972 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) 5055 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
4973 { 5056 {
5057 Vector3 offsetPosition = data.OffsetPosition;
5058 Quaternion rotation = data.Rotation;
5059 uint parentID = data.ParentID;
5060
5061 if (parentID != 0)
5062 {
5063 SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
5064 if (part != null && part != part.ParentGroup.RootPart)
5065 {
5066 offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
5067 rotation = part.RotationOffset * data.Rotation;
5068 parentID = part.ParentGroup.RootPart.LocalId;
5069 }
5070 }
5071
4974 byte[] objectData = new byte[76]; 5072 byte[] objectData = new byte[76];
4975 5073
4976 data.CollisionPlane.ToBytes(objectData, 0); 5074 data.CollisionPlane.ToBytes(objectData, 0);
4977 data.OffsetPosition.ToBytes(objectData, 16); 5075 offsetPosition.ToBytes(objectData, 16);
4978// data.Velocity.ToBytes(objectData, 28); 5076// data.Velocity.ToBytes(objectData, 28);
4979// data.Acceleration.ToBytes(objectData, 40); 5077// data.Acceleration.ToBytes(objectData, 40);
4980 data.Rotation.ToBytes(objectData, 52); 5078 rotation.ToBytes(objectData, 52);
4981 //data.AngularVelocity.ToBytes(objectData, 64); 5079 //data.AngularVelocity.ToBytes(objectData, 64);
4982 5080
4983 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); 5081 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -4991,7 +5089,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4991 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5089 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
4992 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5090 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
4993 update.ObjectData = objectData; 5091 update.ObjectData = objectData;
4994 update.ParentID = data.ParentID; 5092 update.ParentID = parentID;
4995 update.PathCurve = 16; 5093 update.PathCurve = 16;
4996 update.PathScaleX = 100; 5094 update.PathScaleX = 100;
4997 update.PathScaleY = 100; 5095 update.PathScaleY = 100;
@@ -5009,10 +5107,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5009 update.TextureEntry = Utils.EmptyBytes; 5107 update.TextureEntry = Utils.EmptyBytes;
5010// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; 5108// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
5011 5109
5110/* 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)
5012 update.UpdateFlags = (uint)( 5111 update.UpdateFlags = (uint)(
5013 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | 5112 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
5014 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | 5113 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
5015 PrimFlags.ObjectOwnerModify); 5114 PrimFlags.ObjectOwnerModify);
5115*/
5116 update.UpdateFlags = 0;
5016 5117
5017 return update; 5118 return update;
5018 } 5119 }
@@ -5332,6 +5433,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5332 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 5433 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
5333 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 5434 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
5334 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 5435 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
5436 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
5335 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 5437 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
5336 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 5438 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
5337 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 5439 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5398,6 +5500,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5398 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); 5500 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
5399 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); 5501 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
5400 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); 5502 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
5503 AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
5401 5504
5402 AddGenericPacketHandler("autopilot", HandleAutopilot); 5505 AddGenericPacketHandler("autopilot", HandleAutopilot);
5403 } 5506 }
@@ -5433,6 +5536,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5433 (x.CameraLeftAxis != lastarg.CameraLeftAxis) || 5536 (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
5434 (x.CameraUpAxis != lastarg.CameraUpAxis) || 5537 (x.CameraUpAxis != lastarg.CameraUpAxis) ||
5435 (x.ControlFlags != lastarg.ControlFlags) || 5538 (x.ControlFlags != lastarg.ControlFlags) ||
5539 (x.ControlFlags != 0) ||
5436 (x.Far != lastarg.Far) || 5540 (x.Far != lastarg.Far) ||
5437 (x.Flags != lastarg.Flags) || 5541 (x.Flags != lastarg.Flags) ||
5438 (x.State != lastarg.State) || 5542 (x.State != lastarg.State) ||
@@ -5810,7 +5914,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5810 args.Channel = ch; 5914 args.Channel = ch;
5811 args.From = String.Empty; 5915 args.From = String.Empty;
5812 args.Message = Utils.BytesToString(msg); 5916 args.Message = Utils.BytesToString(msg);
5813 args.Type = ChatTypeEnum.Shout; 5917 args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance
5814 args.Position = new Vector3(); 5918 args.Position = new Vector3();
5815 args.Scene = Scene; 5919 args.Scene = Scene;
5816 args.Sender = this; 5920 args.Sender = this;
@@ -6330,6 +6434,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6330 { 6434 {
6331 handlerCompleteMovementToRegion(sender, true); 6435 handlerCompleteMovementToRegion(sender, true);
6332 } 6436 }
6437 else
6438 m_log.Debug("HandleCompleteAgentMovement NULL handler");
6439
6333 handlerCompleteMovementToRegion = null; 6440 handlerCompleteMovementToRegion = null;
6334 6441
6335 return true; 6442 return true;
@@ -6347,7 +6454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6347 return true; 6454 return true;
6348 } 6455 }
6349 #endregion 6456 #endregion
6350 6457/*
6351 StartAnim handlerStartAnim = null; 6458 StartAnim handlerStartAnim = null;
6352 StopAnim handlerStopAnim = null; 6459 StopAnim handlerStopAnim = null;
6353 6460
@@ -6371,6 +6478,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6371 } 6478 }
6372 } 6479 }
6373 return true; 6480 return true;
6481*/
6482 ChangeAnim handlerChangeAnim = null;
6483
6484 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
6485 {
6486 handlerChangeAnim = OnChangeAnim;
6487 if (handlerChangeAnim != null)
6488 {
6489 handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
6490 }
6491 }
6492
6493 handlerChangeAnim = OnChangeAnim;
6494 if (handlerChangeAnim != null)
6495 {
6496 handlerChangeAnim(UUID.Zero, false, true);
6497 }
6498
6499 return true;
6374 } 6500 }
6375 6501
6376 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) 6502 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -6996,10 +7122,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6996 // 46,47,48 are special positions within the packet 7122 // 46,47,48 are special positions within the packet
6997 // This may change so perhaps we need a better way 7123 // This may change so perhaps we need a better way
6998 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) 7124 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?)
6999 bool UsePhysics = (data[46] != 0) ? true : false; 7125 /*
7000 bool IsTemporary = (data[47] != 0) ? true : false; 7126 bool UsePhysics = (data[46] != 0) ? true : false;
7001 bool IsPhantom = (data[48] != 0) ? true : false; 7127 bool IsTemporary = (data[47] != 0) ? true : false;
7002 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this); 7128 bool IsPhantom = (data[48] != 0) ? true : false;
7129 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this);
7130 */
7131 bool UsePhysics = flags.AgentData.UsePhysics;
7132 bool IsPhantom = flags.AgentData.IsPhantom;
7133 bool IsTemporary = flags.AgentData.IsTemporary;
7134 ObjectFlagUpdatePacket.ExtraPhysicsBlock[] blocks = flags.ExtraPhysics;
7135 ExtraPhysicsData physdata = new ExtraPhysicsData();
7136
7137 if (blocks == null || blocks.Length == 0)
7138 {
7139 physdata.PhysShapeType = PhysShapeType.invalid;
7140 }
7141 else
7142 {
7143 ObjectFlagUpdatePacket.ExtraPhysicsBlock phsblock = blocks[0];
7144 physdata.PhysShapeType = (PhysShapeType)phsblock.PhysicsShapeType;
7145 physdata.Bounce = phsblock.Restitution;
7146 physdata.Density = phsblock.Density;
7147 physdata.Friction = phsblock.Friction;
7148 physdata.GravitationModifier = phsblock.GravityMultiplier;
7149 }
7150
7151 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
7003 } 7152 }
7004 return true; 7153 return true;
7005 } 7154 }
@@ -9853,7 +10002,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9853 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, 10002 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
9854 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), 10003 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
9855 UpdateMuteListEntry.MuteData.MuteType, 10004 UpdateMuteListEntry.MuteData.MuteType,
9856 UpdateMuteListEntry.AgentData.AgentID); 10005 UpdateMuteListEntry.MuteData.MuteFlags);
9857 return true; 10006 return true;
9858 } 10007 }
9859 return false; 10008 return false;
@@ -9868,8 +10017,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9868 { 10017 {
9869 handlerRemoveMuteListEntry(this, 10018 handlerRemoveMuteListEntry(this,
9870 RemoveMuteListEntry.MuteData.MuteID, 10019 RemoveMuteListEntry.MuteData.MuteID,
9871 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), 10020 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
9872 RemoveMuteListEntry.AgentData.AgentID);
9873 return true; 10021 return true;
9874 } 10022 }
9875 return false; 10023 return false;
@@ -9913,10 +10061,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9913 return false; 10061 return false;
9914 } 10062 }
9915 10063
10064 private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
10065 {
10066 ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
10067 (ChangeInventoryItemFlagsPacket)packet;
10068 ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
10069 if (handlerChangeInventoryItemFlags != null)
10070 {
10071 foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
10072 handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
10073 return true;
10074 }
10075 return false;
10076 }
10077
9916 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) 10078 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
9917 { 10079 {
9918 return true; 10080 return true;
9919 } 10081 }
10082
10083 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
10084 {
10085 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
10086
10087 #region Packet Session and User Check
10088 if (m_checkPackets)
10089 {
10090 if (packet.AgentData.SessionID != SessionId ||
10091 packet.AgentData.AgentID != AgentId)
10092 return true;
10093 }
10094 #endregion
10095 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
10096 List<InventoryItemBase> items = new List<InventoryItemBase>();
10097 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
10098 {
10099 InventoryItemBase b = new InventoryItemBase();
10100 b.ID = n.OldItemID;
10101 b.Folder = n.OldFolderID;
10102 items.Add(b);
10103 }
10104
10105 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
10106 if (handlerMoveItemsAndLeaveCopy != null)
10107 {
10108 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
10109 }
10110
10111 return true;
10112 }
9920 10113
9921 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 10114 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9922 { 10115 {
@@ -10343,6 +10536,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10343 groupProfileReply.GroupData.MaturePublish = d.MaturePublish; 10536 groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
10344 groupProfileReply.GroupData.OwnerRole = d.OwnerRole; 10537 groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
10345 10538
10539 Scene scene = (Scene)m_scene;
10540 if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
10541 {
10542 ScenePresence p;
10543 if (scene.TryGetScenePresence(sender.AgentId, out p))
10544 {
10545 if (p.GodLevel >= 200)
10546 {
10547 groupProfileReply.GroupData.OpenEnrollment = true;
10548 groupProfileReply.GroupData.MembershipFee = 0;
10549 }
10550 }
10551 }
10552
10346 OutPacket(groupProfileReply, ThrottleOutPacketType.Task); 10553 OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
10347 } 10554 }
10348 return true; 10555 return true;
@@ -10916,11 +11123,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10916 11123
10917 StartLure handlerStartLure = OnStartLure; 11124 StartLure handlerStartLure = OnStartLure;
10918 if (handlerStartLure != null) 11125 if (handlerStartLure != null)
10919 handlerStartLure(startLureRequest.Info.LureType, 11126 {
10920 Utils.BytesToString( 11127 for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
10921 startLureRequest.Info.Message), 11128 {
10922 startLureRequest.TargetData[0].TargetID, 11129 handlerStartLure(startLureRequest.Info.LureType,
10923 this); 11130 Utils.BytesToString(
11131 startLureRequest.Info.Message),
11132 startLureRequest.TargetData[i].TargetID,
11133 this);
11134 }
11135 }
10924 return true; 11136 return true;
10925 } 11137 }
10926 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) 11138 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -11034,10 +11246,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11034 } 11246 }
11035 #endregion 11247 #endregion
11036 11248
11037 ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; 11249 ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
11038 if (handlerClassifiedGodDelete != null) 11250 if (handlerClassifiedGodDelete != null)
11039 handlerClassifiedGodDelete( 11251 handlerClassifiedGodDelete(
11040 classifiedGodDelete.Data.ClassifiedID, 11252 classifiedGodDelete.Data.ClassifiedID,
11253 classifiedGodDelete.Data.QueryID,
11041 this); 11254 this);
11042 return true; 11255 return true;
11043 } 11256 }
@@ -11403,209 +11616,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11403 } 11616 }
11404 else 11617 else
11405 { 11618 {
11406// m_log.DebugFormat( 11619 ClientChangeObject updatehandler = onClientChangeObject;
11407// "[CLIENT]: Processing block {0} type {1} for {2} {3}",
11408// i, block.Type, part.Name, part.LocalId);
11409 11620
11410// // Do this once since fetch parts creates a new array. 11621 if (updatehandler != null)
11411// SceneObjectPart[] parts = part.ParentGroup.Parts; 11622 {
11412// for (int j = 0; j < parts.Length; j++) 11623 ObjectChangeData udata = new ObjectChangeData();
11413// {
11414// part.StoreUndoState();
11415// parts[j].IgnoreUndoUpdate = true;
11416// }
11417 11624
11418 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; 11625 /*ubit from ll JIRA:
11626 * 0x01 position
11627 * 0x02 rotation
11628 * 0x04 scale
11629
11630 * 0x08 LINK_SET
11631 * 0x10 UNIFORM for scale
11632 */
11419 11633
11420 switch (block.Type) 11634 // translate to internal changes
11421 { 11635 // not all cases .. just the ones older code did
11422 case 1:
11423 Vector3 pos1 = new Vector3(block.Data, 0);
11424 11636
11425 UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11637 switch (block.Type)
11426 if (handlerUpdatePrimSinglePosition != null) 11638 {
11427 { 11639 case 1: //change position sp
11428 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11640 udata.position = new Vector3(block.Data, 0);
11429 handlerUpdatePrimSinglePosition(localId, pos1, this);
11430 }
11431 break;
11432 11641
11433 case 2: 11642 udata.change = ObjectChangeType.primP;
11434 Quaternion rot1 = new Quaternion(block.Data, 0, true); 11643 updatehandler(localId, udata, this);
11644 break;
11435 11645
11436 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 11646 case 2: // rotation sp
11437 if (handlerUpdatePrimSingleRotation != null) 11647 udata.rotation = new Quaternion(block.Data, 0, true);
11438 {
11439 // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
11440 handlerUpdatePrimSingleRotation(localId, rot1, this);
11441 }
11442 break;
11443 11648
11444 case 3: 11649 udata.change = ObjectChangeType.primR;
11445 Vector3 rotPos = new Vector3(block.Data, 0); 11650 updatehandler(localId, udata, this);
11446 Quaternion rot2 = new Quaternion(block.Data, 12, true); 11651 break;
11447 11652
11448 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; 11653 case 3: // position plus rotation
11449 if (handlerUpdatePrimSingleRotationPosition != null) 11654 udata.position = new Vector3(block.Data, 0);
11450 { 11655 udata.rotation = new Quaternion(block.Data, 12, true);
11451 // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
11452 // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
11453 handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
11454 }
11455 break;
11456 11656
11457 case 4: 11657 udata.change = ObjectChangeType.primPR;
11458 case 20: 11658 updatehandler(localId, udata, this);
11459 Vector3 scale4 = new Vector3(block.Data, 0); 11659 break;
11460 11660
11461 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; 11661 case 4: // scale sp
11462 if (handlerUpdatePrimScale != null) 11662 udata.scale = new Vector3(block.Data, 0);
11463 { 11663 udata.change = ObjectChangeType.primS;
11464 // m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
11465 handlerUpdatePrimScale(localId, scale4, this);
11466 }
11467 break;
11468 11664
11469 case 5: 11665 updatehandler(localId, udata, this);
11470 Vector3 scale1 = new Vector3(block.Data, 12); 11666 break;
11471 Vector3 pos11 = new Vector3(block.Data, 0);
11472 11667
11473 handlerUpdatePrimScale = OnUpdatePrimScale; 11668 case 0x14: // uniform scale sp
11474 if (handlerUpdatePrimScale != null) 11669 udata.scale = new Vector3(block.Data, 0);
11475 {
11476 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11477 handlerUpdatePrimScale(localId, scale1, this);
11478 11670
11479 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11671 udata.change = ObjectChangeType.primUS;
11480 if (handlerUpdatePrimSinglePosition != null) 11672 updatehandler(localId, udata, this);
11481 { 11673 break;
11482 handlerUpdatePrimSinglePosition(localId, pos11, this);
11483 }
11484 }
11485 break;
11486 11674
11487 case 9: 11675 case 5: // scale and position sp
11488 Vector3 pos2 = new Vector3(block.Data, 0); 11676 udata.position = new Vector3(block.Data, 0);
11677 udata.scale = new Vector3(block.Data, 12);
11489 11678
11490 UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; 11679 udata.change = ObjectChangeType.primPS;
11680 updatehandler(localId, udata, this);
11681 break;
11491 11682
11492 if (handlerUpdateVector != null) 11683 case 0x15: //uniform scale and position
11493 { 11684 udata.position = new Vector3(block.Data, 0);
11494 handlerUpdateVector(localId, pos2, this); 11685 udata.scale = new Vector3(block.Data, 12);
11495 }
11496 break;
11497 11686
11498 case 10: 11687 udata.change = ObjectChangeType.primPUS;
11499 Quaternion rot3 = new Quaternion(block.Data, 0, true); 11688 updatehandler(localId, udata, this);
11689 break;
11500 11690
11501 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; 11691 // now group related (bit 4)
11502 if (handlerUpdatePrimRotation != null) 11692 case 9: //( 8 + 1 )group position
11503 { 11693 udata.position = new Vector3(block.Data, 0);
11504 // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
11505 handlerUpdatePrimRotation(localId, rot3, this);
11506 }
11507 break;
11508 11694
11509 case 11: 11695 udata.change = ObjectChangeType.groupP;
11510 Vector3 pos3 = new Vector3(block.Data, 0); 11696 updatehandler(localId, udata, this);
11511 Quaternion rot4 = new Quaternion(block.Data, 12, true); 11697 break;
11512 11698
11513 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 11699 case 0x0A: // (8 + 2) group rotation
11514 if (handlerUpdatePrimGroupRotation != null) 11700 udata.rotation = new Quaternion(block.Data, 0, true);
11515 {
11516 // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11517 // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
11518 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
11519 }
11520 break;
11521 case 12:
11522 case 28:
11523 Vector3 scale7 = new Vector3(block.Data, 0);
11524 11701
11525 UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11702 udata.change = ObjectChangeType.groupR;
11526 if (handlerUpdatePrimGroupScale != null) 11703 updatehandler(localId, udata, this);
11527 { 11704 break;
11528 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11529 handlerUpdatePrimGroupScale(localId, scale7, this);
11530 }
11531 break;
11532 11705
11533 case 13: 11706 case 0x0B: //( 8 + 2 + 1) group rotation and position
11534 Vector3 scale2 = new Vector3(block.Data, 12); 11707 udata.position = new Vector3(block.Data, 0);
11535 Vector3 pos4 = new Vector3(block.Data, 0); 11708 udata.rotation = new Quaternion(block.Data, 12, true);
11536 11709
11537 handlerUpdatePrimScale = OnUpdatePrimScale; 11710 udata.change = ObjectChangeType.groupPR;
11538 if (handlerUpdatePrimScale != null) 11711 updatehandler(localId, udata, this);
11539 { 11712 break;
11540 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11541 handlerUpdatePrimScale(localId, scale2, this);
11542 11713
11543 // Change the position based on scale (for bug number 246) 11714 case 0x0C: // (8 + 4) group scale
11544 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11715 // only afects root prim and only sent by viewer editor object tab scaling
11545 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11716 // mouse edition only allows uniform scaling
11546 if (handlerUpdatePrimSinglePosition != null) 11717 // SL MAY CHANGE THIS in viewers
11547 {
11548 handlerUpdatePrimSinglePosition(localId, pos4, this);
11549 }
11550 }
11551 break;
11552 11718
11553 case 29: 11719 udata.scale = new Vector3(block.Data, 0);
11554 Vector3 scale5 = new Vector3(block.Data, 12);
11555 Vector3 pos5 = new Vector3(block.Data, 0);
11556 11720
11557 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11721 udata.change = ObjectChangeType.groupS;
11558 if (handlerUpdatePrimGroupScale != null) 11722 updatehandler(localId, udata, this);
11559 {
11560 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11561 part.StoreUndoState(true);
11562 part.IgnoreUndoUpdate = true;
11563 handlerUpdatePrimGroupScale(localId, scale5, this);
11564 handlerUpdateVector = OnUpdatePrimGroupPosition;
11565 11723
11566 if (handlerUpdateVector != null) 11724 break;
11567 {
11568 handlerUpdateVector(localId, pos5, this);
11569 }
11570 11725
11571 part.IgnoreUndoUpdate = false; 11726 case 0x0D: //(8 + 4 + 1) group scale and position
11572 } 11727 // exception as above
11573 11728
11574 break; 11729 udata.position = new Vector3(block.Data, 0);
11730 udata.scale = new Vector3(block.Data, 12);
11575 11731
11576 case 21: 11732 udata.change = ObjectChangeType.groupPS;
11577 Vector3 scale6 = new Vector3(block.Data, 12); 11733 updatehandler(localId, udata, this);
11578 Vector3 pos6 = new Vector3(block.Data, 0); 11734 break;
11579 11735
11580 handlerUpdatePrimScale = OnUpdatePrimScale; 11736 case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
11581 if (handlerUpdatePrimScale != null) 11737 udata.scale = new Vector3(block.Data, 0);
11582 {
11583 part.StoreUndoState(false);
11584 part.IgnoreUndoUpdate = true;
11585 11738
11586 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 11739 udata.change = ObjectChangeType.groupUS;
11587 handlerUpdatePrimScale(localId, scale6, this); 11740 updatehandler(localId, udata, this);
11588 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11741 break;
11589 if (handlerUpdatePrimSinglePosition != null)
11590 {
11591 handlerUpdatePrimSinglePosition(localId, pos6, this);
11592 }
11593 11742
11594 part.IgnoreUndoUpdate = false; 11743 case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
11595 } 11744 udata.position = new Vector3(block.Data, 0);
11596 break; 11745 udata.scale = new Vector3(block.Data, 12);
11597 11746
11598 default: 11747 udata.change = ObjectChangeType.groupPUS;
11599 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); 11748 updatehandler(localId, udata, this);
11600 break; 11749 break;
11750
11751 default:
11752 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
11753 break;
11754 }
11601 } 11755 }
11602 11756
11603// for (int j = 0; j < parts.Length; j++)
11604// parts[j].IgnoreUndoUpdate = false;
11605 } 11757 }
11606 } 11758 }
11607 } 11759 }
11608
11609 return true; 11760 return true;
11610 } 11761 }
11611 11762
@@ -12055,7 +12206,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12055// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", 12206// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
12056// requestID, taskID, (SourceType)sourceType, Name); 12207// requestID, taskID, (SourceType)sourceType, Name);
12057 12208
12209
12210 //Note, the bool returned from the below function is useless since it is always false.
12058 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 12211 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
12212
12059 } 12213 }
12060 12214
12061 /// <summary> 12215 /// <summary>
@@ -12121,7 +12275,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12121 /// <returns></returns> 12275 /// <returns></returns>
12122 private static int CalculateNumPackets(byte[] data) 12276 private static int CalculateNumPackets(byte[] data)
12123 { 12277 {
12124 const uint m_maxPacketSize = 600; 12278// const uint m_maxPacketSize = 600;
12279 uint m_maxPacketSize = MaxTransferBytesPerPacket;
12125 int numPackets = 1; 12280 int numPackets = 1;
12126 12281
12127 if (data == null) 12282 if (data == null)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 8963756..c472176 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
@@ -440,6 +441,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
440 if (category >= 0 && category < m_packetOutboxes.Length) 441 if (category >= 0 && category < m_packetOutboxes.Length)
441 { 442 {
442 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 443 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
444
445 if (m_deliverPackets == false)
446 {
447 queue.Enqueue(packet);
448 return true;
449 }
450
443 TokenBucket bucket = m_throttleCategories[category]; 451 TokenBucket bucket = m_throttleCategories[category];
444 452
445 // Don't send this packet if there is already a packet waiting in the queue 453 // Don't send this packet if there is already a packet waiting in the queue
@@ -489,7 +497,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
489 /// <returns>True if any packets were sent, otherwise false</returns> 497 /// <returns>True if any packets were sent, otherwise false</returns>
490 public bool DequeueOutgoing() 498 public bool DequeueOutgoing()
491 { 499 {
492 OutgoingPacket packet; 500 if (m_deliverPackets == false) return false;
501
502 OutgoingPacket packet = null;
493 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 503 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
494 TokenBucket bucket; 504 TokenBucket bucket;
495 bool packetSent = false; 505 bool packetSent = false;
@@ -521,32 +531,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
521 // No dequeued packet waiting to be sent, try to pull one off 531 // No dequeued packet waiting to be sent, try to pull one off
522 // this queue 532 // this queue
523 queue = m_packetOutboxes[i]; 533 queue = m_packetOutboxes[i];
524 if (queue.Dequeue(out packet)) 534 if (queue != null)
525 { 535 {
526 // A packet was pulled off the queue. See if we have 536 bool success = false;
527 // enough tokens in the bucket to send it out 537 try
528 if (bucket.RemoveTokens(packet.Buffer.DataLength))
529 { 538 {
530 // Send the packet 539 success = queue.Dequeue(out packet);
531 m_udpServer.SendPacketFinal(packet);
532 packetSent = true;
533 } 540 }
534 else 541 catch
535 { 542 {
536 // Save the dequeued packet for the next iteration 543 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
537 m_nextPackets[i] = packet;
538 } 544 }
539 545 if (success)
540 // If the queue is empty after this dequeue, fire the queue 546 {
541 // empty callback now so it has a chance to fill before we 547 // A packet was pulled off the queue. See if we have
542 // get back here 548 // enough tokens in the bucket to send it out
543 if (queue.Count == 0) 549 if (bucket.RemoveTokens(packet.Buffer.DataLength))
550 {
551 // Send the packet
552 m_udpServer.SendPacketFinal(packet);
553 packetSent = true;
554 }
555 else
556 {
557 // Save the dequeued packet for the next iteration
558 m_nextPackets[i] = packet;
559 }
560
561 // If the queue is empty after this dequeue, fire the queue
562 // empty callback now so it has a chance to fill before we
563 // get back here
564 if (queue.Count == 0)
565 emptyCategories |= CategoryToFlag(i);
566 }
567 else
568 {
569 // No packets in this queue. Fire the queue empty callback
570 // if it has not been called recently
544 emptyCategories |= CategoryToFlag(i); 571 emptyCategories |= CategoryToFlag(i);
572 }
545 } 573 }
546 else 574 else
547 { 575 {
548 // No packets in this queue. Fire the queue empty callback 576 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
549 // if it has not been called recently
550 emptyCategories |= CategoryToFlag(i); 577 emptyCategories |= CategoryToFlag(i);
551 } 578 }
552 } 579 }
@@ -704,4 +731,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
704 } 731 }
705 } 732 }
706 } 733 }
707} \ No newline at end of file 734}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 55780d6..7042c9a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -155,6 +155,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
155 /// <summary>Flag to signal when clients should send pings</summary> 155 /// <summary>Flag to signal when clients should send pings</summary>
156 protected bool m_sendPing; 156 protected bool m_sendPing;
157 157
158 private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
159
158 private int m_defaultRTO = 0; 160 private int m_defaultRTO = 0;
159 private int m_maxRTO = 0; 161 private int m_maxRTO = 0;
160 private int m_ackTimeout = 0; 162 private int m_ackTimeout = 0;
@@ -765,19 +767,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
765 767
766 #region Packet to Client Mapping 768 #region Packet to Client Mapping
767 769
768 // UseCircuitCode handling 770 // If there is already a client for this endpoint, don't process UseCircuitCode
769 if (packet.Type == PacketType.UseCircuitCode) 771 IClientAPI client = null;
772 if (!m_scene.TryGetClient(address, out client))
770 { 773 {
771 object[] array = new object[] { buffer, packet }; 774 // UseCircuitCode handling
775 if (packet.Type == PacketType.UseCircuitCode)
776 {
777 // And if there is a UseCircuitCode pending, also drop it
778 lock (m_pendingCache)
779 {
780 if (m_pendingCache.Contains(address))
781 return;
772 782
773 Util.FireAndForget(HandleUseCircuitCode, array); 783 m_pendingCache.AddOrUpdate(address, new Queue<UDPPacketBuffer>(), 60);
784 }
774 785
775 return; 786 object[] array = new object[] { buffer, packet };
787
788 Util.FireAndForget(HandleUseCircuitCode, array);
789
790 return;
791 }
792 }
793
794 // If this is a pending connection, enqueue, don't process yet
795 lock (m_pendingCache)
796 {
797 Queue<UDPPacketBuffer> queue;
798 if (m_pendingCache.TryGetValue(address, out queue))
799 {
800 //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
801 queue.Enqueue(buffer);
802 return;
803 }
776 } 804 }
777 805
778 // Determine which agent this packet came from 806 // Determine which agent this packet came from
779 IClientAPI client; 807 if (client == null || !(client is LLClientView))
780 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
781 { 808 {
782 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); 809 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
783 return; 810 return;
@@ -786,7 +813,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
786 udpClient = ((LLClientView)client).UDPClient; 813 udpClient = ((LLClientView)client).UDPClient;
787 814
788 if (!udpClient.IsConnected) 815 if (!udpClient.IsConnected)
816 {
817// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
789 return; 818 return;
819 }
790 820
791 #endregion Packet to Client Mapping 821 #endregion Packet to Client Mapping
792 822
@@ -1011,6 +1041,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1011 // We only want to send initial data to new clients, not ones which are being converted from child to root. 1041 // We only want to send initial data to new clients, not ones which are being converted from child to root.
1012 if (client != null) 1042 if (client != null)
1013 client.SceneAgent.SendInitialDataToMe(); 1043 client.SceneAgent.SendInitialDataToMe();
1044
1045 // Now we know we can handle more data
1046 Thread.Sleep(200);
1047
1048 // Obtain the queue and remove it from the cache
1049 Queue<UDPPacketBuffer> queue = null;
1050
1051 lock (m_pendingCache)
1052 {
1053 if (!m_pendingCache.TryGetValue(remoteEndPoint, out queue))
1054 {
1055 m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
1056 return;
1057 }
1058 m_pendingCache.Remove(remoteEndPoint);
1059 }
1060
1061 m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
1062
1063 // Reinject queued packets
1064 while(queue.Count > 0)
1065 {
1066 UDPPacketBuffer buf = queue.Dequeue();
1067 PacketReceived(buf);
1068 }
1069 queue = null;
1014 } 1070 }
1015 else 1071 else
1016 { 1072 {
@@ -1018,6 +1074,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1018 m_log.WarnFormat( 1074 m_log.WarnFormat(
1019 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", 1075 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
1020 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, remoteEndPoint); 1076 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, remoteEndPoint);
1077 lock (m_pendingCache)
1078 m_pendingCache.Remove(remoteEndPoint);
1021 } 1079 }
1022 1080
1023 // m_log.DebugFormat( 1081 // m_log.DebugFormat(
@@ -1136,7 +1194,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1136 if (!client.SceneAgent.IsChildAgent) 1194 if (!client.SceneAgent.IsChildAgent)
1137 client.Kick("Simulator logged you out due to connection timeout"); 1195 client.Kick("Simulator logged you out due to connection timeout");
1138 1196
1139 client.CloseWithoutChecks(); 1197 client.CloseWithoutChecks(true);
1140 } 1198 }
1141 } 1199 }
1142 1200
@@ -1148,6 +1206,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1148 1206
1149 while (base.IsRunning) 1207 while (base.IsRunning)
1150 { 1208 {
1209 m_scene.ThreadAlive(1);
1151 try 1210 try
1152 { 1211 {
1153 IncomingPacket incomingPacket = null; 1212 IncomingPacket incomingPacket = null;
@@ -1190,6 +1249,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1190 1249
1191 while (base.IsRunning) 1250 while (base.IsRunning)
1192 { 1251 {
1252 m_scene.ThreadAlive(2);
1193 try 1253 try
1194 { 1254 {
1195 m_packetSent = false; 1255 m_packetSent = false;
@@ -1455,8 +1515,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1455 if (!client.IsLoggingOut) 1515 if (!client.IsLoggingOut)
1456 { 1516 {
1457 client.IsLoggingOut = true; 1517 client.IsLoggingOut = true;
1458 client.Close(); 1518 client.Close(false);
1459 } 1519 }
1460 } 1520 }
1461 } 1521 }
1462} \ No newline at end of file 1522}
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-22 16:04:36 +0000