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 9a61702..f2355e2 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;
@@ -291,6 +292,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
291 public event UpdatePrimTexture OnUpdatePrimTexture; 292 public event UpdatePrimTexture OnUpdatePrimTexture;
292 public event UpdateVector OnUpdatePrimGroupPosition; 293 public event UpdateVector OnUpdatePrimGroupPosition;
293 public event UpdateVector OnUpdatePrimSinglePosition; 294 public event UpdateVector OnUpdatePrimSinglePosition;
295 public event ClientChangeObject onClientChangeObject;
294 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 296 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
295 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; 297 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
296 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 298 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
@@ -429,7 +431,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
429 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 431 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
430 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 432 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
431 public event ClassifiedDelete OnClassifiedDelete; 433 public event ClassifiedDelete OnClassifiedDelete;
432 public event ClassifiedDelete OnClassifiedGodDelete; 434 public event ClassifiedGodDelete OnClassifiedGodDelete;
433 435
434 public event EventNotificationAddRequest OnEventNotificationAddRequest; 436 public event EventNotificationAddRequest OnEventNotificationAddRequest;
435 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 437 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -468,11 +470,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
468 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 470 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
469 public event SimWideDeletesDelegate OnSimWideDeletes; 471 public event SimWideDeletesDelegate OnSimWideDeletes;
470 public event SendPostcard OnSendPostcard; 472 public event SendPostcard OnSendPostcard;
473 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
471 public event MuteListEntryUpdate OnUpdateMuteListEntry; 474 public event MuteListEntryUpdate OnUpdateMuteListEntry;
472 public event MuteListEntryRemove OnRemoveMuteListEntry; 475 public event MuteListEntryRemove OnRemoveMuteListEntry;
473 public event GodlikeMessage onGodlikeMessage; 476 public event GodlikeMessage onGodlikeMessage;
474 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 477 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
475 478 public event GenericCall2 OnUpdateThrottles;
476#pragma warning restore 67 479#pragma warning restore 67
477 480
478 #endregion 481 #endregion
@@ -495,6 +498,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
495 public virtual UUID AgentId 498 public virtual UUID AgentId
496 { 499 {
497 get { return m_uuid; } 500 get { return m_uuid; }
501 set { m_uuid = value; }
498 } 502 }
499 503
500 public UUID SessionId 504 public UUID SessionId
@@ -600,6 +604,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
600 public virtual void SetChildAgentThrottle(byte[] throttle) 604 public virtual void SetChildAgentThrottle(byte[] throttle)
601 { 605 {
602 } 606 }
607
608 public void SetAgentThrottleSilent(int throttle, int setting)
609 {
610
611
612 }
603 public byte[] GetThrottlesPacked(float multiplier) 613 public byte[] GetThrottlesPacked(float multiplier)
604 { 614 {
605 return new byte[0]; 615 return new byte[0];
@@ -744,6 +754,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
744 { 754 {
745 } 755 }
746 756
757 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
758 {
759 }
760
747 public virtual void SendRemoveInventoryItem(UUID itemID) 761 public virtual void SendRemoveInventoryItem(UUID itemID)
748 { 762 {
749 } 763 }
@@ -760,7 +774,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
760 { 774 {
761 } 775 }
762 776
763 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) 777 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
764 { 778 {
765 } 779 }
766 public virtual void SendAbortXferPacket(ulong xferID) 780 public virtual void SendAbortXferPacket(ulong xferID)
@@ -905,10 +919,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
905 919
906 public void Close() 920 public void Close()
907 { 921 {
908 Close(false); 922 Close(true, false);
909 } 923 }
910 924
911 public void Close(bool force) 925 public void Close(bool sendStop, bool force)
912 { 926 {
913 // Remove ourselves from the scene 927 // Remove ourselves from the scene
914 m_scene.RemoveClient(AgentId, false); 928 m_scene.RemoveClient(AgentId, false);