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 9c838d0..d206f69 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 6d40a92..17fd6b1 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -171,7 +171,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
171 | #pragma warning disable 67 | 171 | #pragma warning disable 67 |
172 | public event Action<IClientAPI> OnLogout; | 172 | public event Action<IClientAPI> OnLogout; |
173 | public event ObjectPermissions OnObjectPermissions; | 173 | public event ObjectPermissions OnObjectPermissions; |
174 | 174 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
175 | public event MoneyTransferRequest OnMoneyTransferRequest; | 175 | public event MoneyTransferRequest OnMoneyTransferRequest; |
176 | public event ParcelBuy OnParcelBuy; | 176 | public event ParcelBuy OnParcelBuy; |
177 | public event Action<IClientAPI> OnConnectionClosed; | 177 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -377,7 +377,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
377 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 377 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
378 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 378 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
379 | public event ClassifiedDelete OnClassifiedDelete; | 379 | public event ClassifiedDelete OnClassifiedDelete; |
380 | public event ClassifiedDelete OnClassifiedGodDelete; | 380 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
381 | 381 | ||
382 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 382 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
383 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 383 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -416,6 +416,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
416 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 416 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
417 | public event SimWideDeletesDelegate OnSimWideDeletes; | 417 | public event SimWideDeletesDelegate OnSimWideDeletes; |
418 | public event SendPostcard OnSendPostcard; | 418 | public event SendPostcard OnSendPostcard; |
419 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
419 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 420 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
420 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 421 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
421 | public event GodlikeMessage onGodlikeMessage; | 422 | public event GodlikeMessage onGodlikeMessage; |
@@ -851,8 +852,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
851 | 852 | ||
852 | public void Close() | 853 | public void Close() |
853 | { | 854 | { |
854 | // Remove ourselves from the scene | 855 | Close(true); |
855 | m_scene.RemoveClient(AgentId, false); | 856 | } |
857 | |||
858 | public void Close(bool sendStop) | ||
859 | { | ||
856 | } | 860 | } |
857 | 861 | ||
858 | public void Start() | 862 | public void Start() |