diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 12 |
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 6a6c4c3..182bdda 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -166,7 +166,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
166 | #pragma warning disable 67 | 166 | #pragma warning disable 67 |
167 | public event Action<IClientAPI> OnLogout; | 167 | public event Action<IClientAPI> OnLogout; |
168 | public event ObjectPermissions OnObjectPermissions; | 168 | public event ObjectPermissions OnObjectPermissions; |
169 | 169 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
170 | public event MoneyTransferRequest OnMoneyTransferRequest; | 170 | public event MoneyTransferRequest OnMoneyTransferRequest; |
171 | public event ParcelBuy OnParcelBuy; | 171 | public event ParcelBuy OnParcelBuy; |
172 | public event Action<IClientAPI> OnConnectionClosed; | 172 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -372,7 +372,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
372 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 372 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
373 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 373 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
374 | public event ClassifiedDelete OnClassifiedDelete; | 374 | public event ClassifiedDelete OnClassifiedDelete; |
375 | public event ClassifiedDelete OnClassifiedGodDelete; | 375 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
376 | 376 | ||
377 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 377 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
378 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 378 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -411,6 +411,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
411 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 411 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
412 | public event SimWideDeletesDelegate OnSimWideDeletes; | 412 | public event SimWideDeletesDelegate OnSimWideDeletes; |
413 | public event SendPostcard OnSendPostcard; | 413 | public event SendPostcard OnSendPostcard; |
414 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
414 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 415 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
415 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 416 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
416 | public event GodlikeMessage onGodlikeMessage; | 417 | public event GodlikeMessage onGodlikeMessage; |
@@ -846,8 +847,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
846 | 847 | ||
847 | public void Close() | 848 | public void Close() |
848 | { | 849 | { |
849 | // Remove ourselves from the scene | 850 | Close(true); |
850 | m_scene.RemoveClient(AgentId, false); | 851 | } |
852 | |||
853 | public void Close(bool sendStop) | ||
854 | { | ||
851 | } | 855 | } |
852 | 856 | ||
853 | public void Start() | 857 | public void Start() |