aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs28
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 592e4e1..c8aab54 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
47 private readonly string m_firstname; 47 private readonly string m_firstname;
48 private readonly string m_lastname; 48 private readonly string m_lastname;
49 private readonly Vector3 m_startPos; 49 private readonly Vector3 m_startPos;
50 private readonly UUID m_uuid = UUID.Random(); 50 private UUID m_uuid = UUID.Random();
51 private readonly Scene m_scene; 51 private readonly Scene m_scene;
52 private readonly UUID m_ownerID; 52 private readonly UUID m_ownerID;
53 53
@@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
221#pragma warning disable 67 221#pragma warning disable 67
222 public event Action<IClientAPI> OnLogout; 222 public event Action<IClientAPI> OnLogout;
223 public event ObjectPermissions OnObjectPermissions; 223 public event ObjectPermissions OnObjectPermissions;
224 224 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
225 public event MoneyTransferRequest OnMoneyTransferRequest; 225 public event MoneyTransferRequest OnMoneyTransferRequest;
226 public event ParcelBuy OnParcelBuy; 226 public event ParcelBuy OnParcelBuy;
227 public event Action<IClientAPI> OnConnectionClosed; 227 public event Action<IClientAPI> OnConnectionClosed;
@@ -241,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
241 public event ObjectDrop OnObjectDrop; 241 public event ObjectDrop OnObjectDrop;
242 public event StartAnim OnStartAnim; 242 public event StartAnim OnStartAnim;
243 public event StopAnim OnStopAnim; 243 public event StopAnim OnStopAnim;
244 public event ChangeAnim OnChangeAnim;
244 public event LinkObjects OnLinkObjects; 245 public event LinkObjects OnLinkObjects;
245 public event DelinkObjects OnDelinkObjects; 246 public event DelinkObjects OnDelinkObjects;
246 public event RequestMapBlocks OnRequestMapBlocks; 247 public event RequestMapBlocks OnRequestMapBlocks;
@@ -290,6 +291,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
290 public event UpdatePrimTexture OnUpdatePrimTexture; 291 public event UpdatePrimTexture OnUpdatePrimTexture;
291 public event UpdateVector OnUpdatePrimGroupPosition; 292 public event UpdateVector OnUpdatePrimGroupPosition;
292 public event UpdateVector OnUpdatePrimSinglePosition; 293 public event UpdateVector OnUpdatePrimSinglePosition;
294 public event ClientChangeObject onClientChangeObject;
293 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 295 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
294 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; 296 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
295 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 297 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
@@ -428,7 +430,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
428 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 430 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
429 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 431 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
430 public event ClassifiedDelete OnClassifiedDelete; 432 public event ClassifiedDelete OnClassifiedDelete;
431 public event ClassifiedDelete OnClassifiedGodDelete; 433 public event ClassifiedGodDelete OnClassifiedGodDelete;
432 434
433 public event EventNotificationAddRequest OnEventNotificationAddRequest; 435 public event EventNotificationAddRequest OnEventNotificationAddRequest;
434 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 436 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -467,11 +469,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
467 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 469 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
468 public event SimWideDeletesDelegate OnSimWideDeletes; 470 public event SimWideDeletesDelegate OnSimWideDeletes;
469 public event SendPostcard OnSendPostcard; 471 public event SendPostcard OnSendPostcard;
472 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
470 public event MuteListEntryUpdate OnUpdateMuteListEntry; 473 public event MuteListEntryUpdate OnUpdateMuteListEntry;
471 public event MuteListEntryRemove OnRemoveMuteListEntry; 474 public event MuteListEntryRemove OnRemoveMuteListEntry;
472 public event GodlikeMessage onGodlikeMessage; 475 public event GodlikeMessage onGodlikeMessage;
473 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 476 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
474 477 public event GenericCall2 OnUpdateThrottles;
475#pragma warning restore 67 478#pragma warning restore 67
476 479
477 #endregion 480 #endregion
@@ -494,6 +497,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
494 public virtual UUID AgentId 497 public virtual UUID AgentId
495 { 498 {
496 get { return m_uuid; } 499 get { return m_uuid; }
500 set { m_uuid = value; }
497 } 501 }
498 502
499 public UUID SessionId 503 public UUID SessionId
@@ -599,6 +603,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
599 public virtual void SetChildAgentThrottle(byte[] throttle) 603 public virtual void SetChildAgentThrottle(byte[] throttle)
600 { 604 {
601 } 605 }
606
607 public void SetAgentThrottleSilent(int throttle, int setting)
608 {
609
610
611 }
602 public byte[] GetThrottlesPacked(float multiplier) 612 public byte[] GetThrottlesPacked(float multiplier)
603 { 613 {
604 return new byte[0]; 614 return new byte[0];
@@ -743,6 +753,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
743 { 753 {
744 } 754 }
745 755
756 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
757 {
758 }
759
746 public virtual void SendRemoveInventoryItem(UUID itemID) 760 public virtual void SendRemoveInventoryItem(UUID itemID)
747 { 761 {
748 } 762 }
@@ -759,7 +773,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
759 { 773 {
760 } 774 }
761 775
762 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) 776 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
763 { 777 {
764 } 778 }
765 public virtual void SendAbortXferPacket(ulong xferID) 779 public virtual void SendAbortXferPacket(ulong xferID)
@@ -904,10 +918,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
904 918
905 public void Close() 919 public void Close()
906 { 920 {
907 Close(false); 921 Close(true, false);
908 } 922 }
909 923
910 public void Close(bool force) 924 public void Close(bool sendStop, bool force)
911 { 925 {
912 // Remove ourselves from the scene 926 // Remove ourselves from the scene
913 m_scene.RemoveClient(AgentId, false); 927 m_scene.RemoveClient(AgentId, false);