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