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 5f4f937..b4181a4 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
165#pragma warning disable 67 165#pragma warning disable 67
166 public event Action<IClientAPI> OnLogout; 166 public event Action<IClientAPI> OnLogout;
167 public event ObjectPermissions OnObjectPermissions; 167 public event ObjectPermissions OnObjectPermissions;
168 168 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
169 public event MoneyTransferRequest OnMoneyTransferRequest; 169 public event MoneyTransferRequest OnMoneyTransferRequest;
170 public event ParcelBuy OnParcelBuy; 170 public event ParcelBuy OnParcelBuy;
171 public event Action<IClientAPI> OnConnectionClosed; 171 public event Action<IClientAPI> OnConnectionClosed;
@@ -370,7 +370,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
370 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 370 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
371 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 371 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
372 public event ClassifiedDelete OnClassifiedDelete; 372 public event ClassifiedDelete OnClassifiedDelete;
373 public event ClassifiedDelete OnClassifiedGodDelete; 373 public event ClassifiedGodDelete OnClassifiedGodDelete;
374 374
375 public event EventNotificationAddRequest OnEventNotificationAddRequest; 375 public event EventNotificationAddRequest OnEventNotificationAddRequest;
376 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 376 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -409,6 +409,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
409 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 409 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
410 public event SimWideDeletesDelegate OnSimWideDeletes; 410 public event SimWideDeletesDelegate OnSimWideDeletes;
411 public event SendPostcard OnSendPostcard; 411 public event SendPostcard OnSendPostcard;
412 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
412 public event MuteListEntryUpdate OnUpdateMuteListEntry; 413 public event MuteListEntryUpdate OnUpdateMuteListEntry;
413 public event MuteListEntryRemove OnRemoveMuteListEntry; 414 public event MuteListEntryRemove OnRemoveMuteListEntry;
414 public event GodlikeMessage onGodlikeMessage; 415 public event GodlikeMessage onGodlikeMessage;
@@ -844,8 +845,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
844 845
845 public void Close() 846 public void Close()
846 { 847 {
847 // Remove ourselves from the scene 848 Close(true);
848 m_scene.RemoveClient(AgentId, false); 849 }
850
851 public void Close(bool sendStop)
852 {
849 } 853 }
850 854
851 public void Start() 855 public void Start()