diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
3 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index b84a34d..d469548 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 96760a2..227450d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
156 | #pragma warning disable 67 | 156 | #pragma warning disable 67 |
157 | public event Action<IClientAPI> OnLogout; | 157 | public event Action<IClientAPI> OnLogout; |
158 | public event ObjectPermissions OnObjectPermissions; | 158 | public event ObjectPermissions OnObjectPermissions; |
159 | 159 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
160 | public event MoneyTransferRequest OnMoneyTransferRequest; | 160 | public event MoneyTransferRequest OnMoneyTransferRequest; |
161 | public event ParcelBuy OnParcelBuy; | 161 | public event ParcelBuy OnParcelBuy; |
162 | public event Action<IClientAPI> OnConnectionClosed; | 162 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -519,7 +519,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
519 | 519 | ||
520 | } | 520 | } |
521 | 521 | ||
522 | public virtual void SendKillObject(ulong regionHandle, uint localID) | 522 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) |
523 | { | 523 | { |
524 | } | 524 | } |
525 | 525 | ||
@@ -846,6 +846,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
846 | 846 | ||
847 | public void Close() | 847 | public void Close() |
848 | { | 848 | { |
849 | Close(true); | ||
850 | } | ||
851 | |||
852 | public void Close(bool sendStop) | ||
853 | { | ||
849 | } | 854 | } |
850 | 855 | ||
851 | public void Start() | 856 | public void Start() |
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index 421da36..2563361 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -386,7 +386,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator | |||
386 | m_scene.ForEachClient(delegate(IClientAPI controller) | 386 | m_scene.ForEachClient(delegate(IClientAPI controller) |
387 | { | 387 | { |
388 | controller.SendKillObject(m_scene.RegionInfo.RegionHandle, | 388 | controller.SendKillObject(m_scene.RegionInfo.RegionHandle, |
389 | selectedTree.LocalId); | 389 | new List<uint>() { selectedTree.LocalId }); |
390 | }); | 390 | }); |
391 | } | 391 | } |
392 | else | 392 | else |
@@ -727,7 +727,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator | |||
727 | m_scene.ForEachClient(delegate(IClientAPI controller) | 727 | m_scene.ForEachClient(delegate(IClientAPI controller) |
728 | { | 728 | { |
729 | controller.SendKillObject(m_scene.RegionInfo.RegionHandle, | 729 | controller.SendKillObject(m_scene.RegionInfo.RegionHandle, |
730 | selectedTree.LocalId); | 730 | new List<uint>() { selectedTree.LocalId }); |
731 | }); | 731 | }); |
732 | 732 | ||
733 | break; | 733 | break; |