aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs73
1 files changed, 57 insertions, 16 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f573c32..f187468 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -265,6 +265,9 @@ namespace OpenSim.Framework
265 public delegate void MoveInventoryItem( 265 public delegate void MoveInventoryItem(
266 IClientAPI remoteClient, List<InventoryItemBase> items); 266 IClientAPI remoteClient, List<InventoryItemBase> items);
267 267
268 public delegate void MoveItemsAndLeaveCopy(
269 IClientAPI remoteClient, List<InventoryItemBase> items, UUID destFolder);
270
268 public delegate void RemoveInventoryItem( 271 public delegate void RemoveInventoryItem(
269 IClientAPI remoteClient, List<UUID> itemIDs); 272 IClientAPI remoteClient, List<UUID> itemIDs);
270 273
@@ -438,6 +441,7 @@ namespace OpenSim.Framework
438 public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client); 441 public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client);
439 public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client); 442 public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
440 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client); 443 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
444 public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client);
441 445
442 public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client); 446 public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
443 public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client); 447 public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
@@ -460,9 +464,9 @@ namespace OpenSim.Framework
460 464
461 public delegate void AgentFOV(IClientAPI client, float verticalAngle); 465 public delegate void AgentFOV(IClientAPI client, float verticalAngle);
462 466
463 public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID); 467 public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
464 468
465 public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID); 469 public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
466 470
467 public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); 471 public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
468 472
@@ -572,34 +576,69 @@ namespace OpenSim.Framework
572 576
573 public class IEntityUpdate 577 public class IEntityUpdate
574 { 578 {
575 public ISceneEntity Entity; 579 private ISceneEntity m_entity;
576 public uint Flags; 580 private uint m_flags;
581 private int m_updateTime;
582
583 public ISceneEntity Entity
584 {
585 get { return m_entity; }
586 }
587
588 public uint Flags
589 {
590 get { return m_flags; }
591 }
592
593 public int UpdateTime
594 {
595 get { return m_updateTime; }
596 }
577 597
578 public virtual void Update(IEntityUpdate update) 598 public virtual void Update(IEntityUpdate update)
579 { 599 {
580 this.Flags |= update.Flags; 600 m_flags |= update.Flags;
601
602 // Use the older of the updates as the updateTime
603 if (Util.EnvironmentTickCountCompare(UpdateTime, update.UpdateTime) > 0)
604 m_updateTime = update.UpdateTime;
581 } 605 }
582 606
583 public IEntityUpdate(ISceneEntity entity, uint flags) 607 public IEntityUpdate(ISceneEntity entity, uint flags)
584 { 608 {
585 Entity = entity; 609 m_entity = entity;
586 Flags = flags; 610 m_flags = flags;
611 m_updateTime = Util.EnvironmentTickCount();
612 }
613
614 public IEntityUpdate(ISceneEntity entity, uint flags, Int32 updateTime)
615 {
616 m_entity = entity;
617 m_flags = flags;
618 m_updateTime = updateTime;
587 } 619 }
588 } 620 }
589
590 621
591 public class EntityUpdate : IEntityUpdate 622 public class EntityUpdate : IEntityUpdate
592 { 623 {
593 // public ISceneEntity Entity; 624 private float m_timeDilation;
594 // public PrimUpdateFlags Flags; 625
595 public float TimeDilation; 626 public float TimeDilation
627 {
628 get { return m_timeDilation; }
629 }
596 630
597 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation) 631 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
598 : base(entity,(uint)flags) 632 : base(entity, (uint)flags)
599 { 633 {
600 //Entity = entity;
601 // Flags = flags; 634 // Flags = flags;
602 TimeDilation = timedilation; 635 m_timeDilation = timedilation;
636 }
637
638 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation, Int32 updateTime)
639 : base(entity,(uint)flags,updateTime)
640 {
641 m_timeDilation = timedilation;
603 } 642 }
604 } 643 }
605 644
@@ -811,6 +850,7 @@ namespace OpenSim.Framework
811 event RequestTaskInventory OnRequestTaskInventory; 850 event RequestTaskInventory OnRequestTaskInventory;
812 event UpdateInventoryItem OnUpdateInventoryItem; 851 event UpdateInventoryItem OnUpdateInventoryItem;
813 event CopyInventoryItem OnCopyInventoryItem; 852 event CopyInventoryItem OnCopyInventoryItem;
853 event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
814 event MoveInventoryItem OnMoveInventoryItem; 854 event MoveInventoryItem OnMoveInventoryItem;
815 event RemoveInventoryFolder OnRemoveInventoryFolder; 855 event RemoveInventoryFolder OnRemoveInventoryFolder;
816 event RemoveInventoryItem OnRemoveInventoryItem; 856 event RemoveInventoryItem OnRemoveInventoryItem;
@@ -929,7 +969,7 @@ namespace OpenSim.Framework
929 event ClassifiedInfoRequest OnClassifiedInfoRequest; 969 event ClassifiedInfoRequest OnClassifiedInfoRequest;
930 event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 970 event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
931 event ClassifiedDelete OnClassifiedDelete; 971 event ClassifiedDelete OnClassifiedDelete;
932 event ClassifiedDelete OnClassifiedGodDelete; 972 event ClassifiedGodDelete OnClassifiedGodDelete;
933 973
934 event EventNotificationAddRequest OnEventNotificationAddRequest; 974 event EventNotificationAddRequest OnEventNotificationAddRequest;
935 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 975 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -981,6 +1021,7 @@ namespace OpenSim.Framework
981 void InPacket(object NewPack); 1021 void InPacket(object NewPack);
982 void ProcessInPacket(Packet NewPack); 1022 void ProcessInPacket(Packet NewPack);
983 void Close(); 1023 void Close();
1024 void Close(bool sendStop);
984 void Kick(string message); 1025 void Kick(string message);
985 1026
986 /// <summary> 1027 /// <summary>
@@ -1012,7 +1053,7 @@ namespace OpenSim.Framework
1012 /// </summary> 1053 /// </summary>
1013 /// <param name="regionHandle"></param> 1054 /// <param name="regionHandle"></param>
1014 /// <param name="localID"></param> 1055 /// <param name="localID"></param>
1015 void SendKillObject(ulong regionHandle, uint localID); 1056 void SendKillObject(ulong regionHandle, List<uint> localID);
1016 1057
1017 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); 1058 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
1018 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 1059 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);