aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs12
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 8fc50ff..54d4e92 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -838,6 +838,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
838 if (module != null) 838 if (module != null)
839 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); 839 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
840 } 840 }
841
842 public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text)
843 {
844 }
841 } 845 }
842 846
843 public enum TransactionType : int 847 public enum TransactionType : int
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index ed60976..1b31663 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
158#pragma warning disable 67 158#pragma warning disable 67
159 public event Action<IClientAPI> OnLogout; 159 public event Action<IClientAPI> OnLogout;
160 public event ObjectPermissions OnObjectPermissions; 160 public event ObjectPermissions OnObjectPermissions;
161 161 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
162 public event MoneyTransferRequest OnMoneyTransferRequest; 162 public event MoneyTransferRequest OnMoneyTransferRequest;
163 public event ParcelBuy OnParcelBuy; 163 public event ParcelBuy OnParcelBuy;
164 public event Action<IClientAPI> OnConnectionClosed; 164 public event Action<IClientAPI> OnConnectionClosed;
@@ -362,7 +362,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
362 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 362 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
363 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 363 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
364 public event ClassifiedDelete OnClassifiedDelete; 364 public event ClassifiedDelete OnClassifiedDelete;
365 public event ClassifiedDelete OnClassifiedGodDelete; 365 public event ClassifiedGodDelete OnClassifiedGodDelete;
366 366
367 public event EventNotificationAddRequest OnEventNotificationAddRequest; 367 public event EventNotificationAddRequest OnEventNotificationAddRequest;
368 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 368 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -401,6 +401,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
401 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 401 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
402 public event SimWideDeletesDelegate OnSimWideDeletes; 402 public event SimWideDeletesDelegate OnSimWideDeletes;
403 public event SendPostcard OnSendPostcard; 403 public event SendPostcard OnSendPostcard;
404 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
404 public event MuteListEntryUpdate OnUpdateMuteListEntry; 405 public event MuteListEntryUpdate OnUpdateMuteListEntry;
405 public event MuteListEntryRemove OnRemoveMuteListEntry; 406 public event MuteListEntryRemove OnRemoveMuteListEntry;
406 public event GodlikeMessage onGodlikeMessage; 407 public event GodlikeMessage onGodlikeMessage;
@@ -836,8 +837,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
836 837
837 public void Close() 838 public void Close()
838 { 839 {
839 // Remove ourselves from the scene 840 Close(true);
840 m_scene.RemoveClient(AgentId, false); 841 }
842
843 public void Close(bool sendStop)
844 {
841 } 845 }
842 846
843 public void Start() 847 public void Start()