diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index a895ee1..c88ccc5 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
61 | private readonly string m_firstname; | 61 | private readonly string m_firstname; |
62 | private readonly string m_lastname; | 62 | private readonly string m_lastname; |
63 | private readonly Vector3 m_startPos; | 63 | private readonly Vector3 m_startPos; |
64 | private readonly UUID m_uuid = UUID.Random(); | 64 | private UUID m_uuid = UUID.Random(); |
65 | private readonly Scene m_scene; | 65 | private readonly Scene m_scene; |
66 | private readonly UUID m_ownerID; | 66 | private readonly UUID m_ownerID; |
67 | 67 | ||
@@ -235,7 +235,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
235 | #pragma warning disable 67 | 235 | #pragma warning disable 67 |
236 | public event Action<IClientAPI> OnLogout; | 236 | public event Action<IClientAPI> OnLogout; |
237 | public event ObjectPermissions OnObjectPermissions; | 237 | public event ObjectPermissions OnObjectPermissions; |
238 | 238 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
239 | public event MoneyTransferRequest OnMoneyTransferRequest; | 239 | public event MoneyTransferRequest OnMoneyTransferRequest; |
240 | public event ParcelBuy OnParcelBuy; | 240 | public event ParcelBuy OnParcelBuy; |
241 | public event Action<IClientAPI> OnConnectionClosed; | 241 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -255,6 +255,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
255 | public event ObjectDrop OnObjectDrop; | 255 | public event ObjectDrop OnObjectDrop; |
256 | public event StartAnim OnStartAnim; | 256 | public event StartAnim OnStartAnim; |
257 | public event StopAnim OnStopAnim; | 257 | public event StopAnim OnStopAnim; |
258 | public event ChangeAnim OnChangeAnim; | ||
258 | public event LinkObjects OnLinkObjects; | 259 | public event LinkObjects OnLinkObjects; |
259 | public event DelinkObjects OnDelinkObjects; | 260 | public event DelinkObjects OnDelinkObjects; |
260 | public event RequestMapBlocks OnRequestMapBlocks; | 261 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -305,6 +306,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
305 | public event UpdatePrimTexture OnUpdatePrimTexture; | 306 | public event UpdatePrimTexture OnUpdatePrimTexture; |
306 | public event UpdateVector OnUpdatePrimGroupPosition; | 307 | public event UpdateVector OnUpdatePrimGroupPosition; |
307 | public event UpdateVector OnUpdatePrimSinglePosition; | 308 | public event UpdateVector OnUpdatePrimSinglePosition; |
309 | public event ClientChangeObject onClientChangeObject; | ||
308 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 310 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
309 | public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; | 311 | public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; |
310 | public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; | 312 | public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; |
@@ -443,7 +445,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
443 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 445 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
444 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 446 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
445 | public event ClassifiedDelete OnClassifiedDelete; | 447 | public event ClassifiedDelete OnClassifiedDelete; |
446 | public event ClassifiedDelete OnClassifiedGodDelete; | 448 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
447 | 449 | ||
448 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 450 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
449 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 451 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -482,11 +484,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
482 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 484 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
483 | public event SimWideDeletesDelegate OnSimWideDeletes; | 485 | public event SimWideDeletesDelegate OnSimWideDeletes; |
484 | public event SendPostcard OnSendPostcard; | 486 | public event SendPostcard OnSendPostcard; |
487 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
485 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 488 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
486 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 489 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
487 | public event GodlikeMessage onGodlikeMessage; | 490 | public event GodlikeMessage onGodlikeMessage; |
488 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 491 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
489 | 492 | public event GenericCall2 OnUpdateThrottles; | |
490 | #pragma warning restore 67 | 493 | #pragma warning restore 67 |
491 | 494 | ||
492 | #endregion | 495 | #endregion |
@@ -509,6 +512,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
509 | public virtual UUID AgentId | 512 | public virtual UUID AgentId |
510 | { | 513 | { |
511 | get { return m_uuid; } | 514 | get { return m_uuid; } |
515 | set { m_uuid = value; } | ||
512 | } | 516 | } |
513 | 517 | ||
514 | public UUID SessionId | 518 | public UUID SessionId |
@@ -614,6 +618,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
614 | public virtual void SetChildAgentThrottle(byte[] throttle) | 618 | public virtual void SetChildAgentThrottle(byte[] throttle) |
615 | { | 619 | { |
616 | } | 620 | } |
621 | |||
622 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
623 | { | ||
624 | |||
625 | |||
626 | } | ||
617 | public byte[] GetThrottlesPacked(float multiplier) | 627 | public byte[] GetThrottlesPacked(float multiplier) |
618 | { | 628 | { |
619 | return new byte[0]; | 629 | return new byte[0]; |
@@ -759,6 +769,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
759 | { | 769 | { |
760 | } | 770 | } |
761 | 771 | ||
772 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
773 | { | ||
774 | } | ||
775 | |||
762 | public virtual void SendRemoveInventoryItem(UUID itemID) | 776 | public virtual void SendRemoveInventoryItem(UUID itemID) |
763 | { | 777 | { |
764 | } | 778 | } |
@@ -775,7 +789,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
775 | { | 789 | { |
776 | } | 790 | } |
777 | 791 | ||
778 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 792 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
779 | { | 793 | { |
780 | } | 794 | } |
781 | public virtual void SendAbortXferPacket(ulong xferID) | 795 | public virtual void SendAbortXferPacket(ulong xferID) |
@@ -920,10 +934,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
920 | 934 | ||
921 | public void Close() | 935 | public void Close() |
922 | { | 936 | { |
923 | Close(false); | 937 | Close(true, false); |
924 | } | 938 | } |
925 | 939 | ||
926 | public void Close(bool force) | 940 | public void Close(bool sendStop, bool force) |
927 | { | 941 | { |
928 | // Remove ourselves from the scene | 942 | // Remove ourselves from the scene |
929 | m_scene.RemoveClient(AgentId, false); | 943 | m_scene.RemoveClient(AgentId, false); |