diff options
author | Adam Frisby | 2008-05-18 10:23:31 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-18 10:23:31 +0000 |
commit | c22b388f838694d1ddc9ac1cdec6d59327cea595 (patch) | |
tree | 45dd4a247ebca2bfa005038f30115a27a8271481 /OpenSim/Region | |
parent | * Fixed a logic error in previous commit. Darn these long client(param,para... (diff) | |
download | opensim-SC-c22b388f838694d1ddc9ac1cdec6d59327cea595.zip opensim-SC-c22b388f838694d1ddc9ac1cdec6d59327cea595.tar.gz opensim-SC-c22b388f838694d1ddc9ac1cdec6d59327cea595.tar.bz2 opensim-SC-c22b388f838694d1ddc9ac1cdec6d59327cea595.tar.xz |
* Patch #1312 from Melanie - Abstracts Money Module to IMoneyModule.
Diffstat (limited to '')
3 files changed, 43 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs b/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs new file mode 100644 index 0000000..0531d5c --- /dev/null +++ b/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs | |||
@@ -0,0 +1,42 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using OpenSim.Framework; | ||
30 | using libsecondlife; | ||
31 | |||
32 | namespace OpenSim.Region.Environment.Interfaces | ||
33 | { | ||
34 | public delegate void ObjectPaid(LLUUID objectID, LLUUID agentID, int amount); | ||
35 | public interface IMoneyModule : IRegionModule | ||
36 | { | ||
37 | bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID, | ||
38 | int amount); | ||
39 | |||
40 | event ObjectPaid OnObjectPaid; | ||
41 | } | ||
42 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 2aab82e..d64afe7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -53,15 +53,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ | 53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ |
54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux | 54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux |
55 | /// </summary> | 55 | /// </summary> |
56 | public delegate void ObjectPaid(LLUUID objectID, LLUUID agentID, int amount); | ||
57 | |||
58 | public interface IMoneyModule : IRegionModule | ||
59 | { | ||
60 | bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID, int amount); | ||
61 | |||
62 | event ObjectPaid OnObjectPaid; | ||
63 | } | ||
64 | |||
65 | public class SampleMoneyModule : IMoneyModule | 56 | public class SampleMoneyModule : IMoneyModule |
66 | { | 57 | { |
67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index f2afe0f..5ef4a6b 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -30,6 +30,7 @@ using libsecondlife; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 31 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
32 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
33 | using OpenSim.Region.Environment.Interfaces; | ||
33 | 34 | ||
34 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 35 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
35 | { | 36 | { |