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 | 11 |
2 files changed, 11 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 152377a..a29ed21 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
157 | #pragma warning disable 67 | 157 | #pragma warning disable 67 |
158 | public event Action<IClientAPI> OnLogout; | 158 | public event Action<IClientAPI> OnLogout; |
159 | public event ObjectPermissions OnObjectPermissions; | 159 | public event ObjectPermissions OnObjectPermissions; |
160 | 160 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
161 | public event MoneyTransferRequest OnMoneyTransferRequest; | 161 | public event MoneyTransferRequest OnMoneyTransferRequest; |
162 | public event ParcelBuy OnParcelBuy; | 162 | public event ParcelBuy OnParcelBuy; |
163 | public event Action<IClientAPI> OnConnectionClosed; | 163 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -361,7 +361,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
361 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 361 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
362 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 362 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
363 | public event ClassifiedDelete OnClassifiedDelete; | 363 | public event ClassifiedDelete OnClassifiedDelete; |
364 | public event ClassifiedDelete OnClassifiedGodDelete; | 364 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
365 | 365 | ||
366 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 366 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
367 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 367 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -835,8 +835,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
835 | 835 | ||
836 | public void Close() | 836 | public void Close() |
837 | { | 837 | { |
838 | // Remove ourselves from the scene | 838 | Close(true); |
839 | m_scene.RemoveClient(AgentId, false); | 839 | } |
840 | |||
841 | public void Close(bool sendStop) | ||
842 | { | ||
840 | } | 843 | } |
841 | 844 | ||
842 | public void Start() | 845 | public void Start() |