diff options
author | Melanie Thielker | 2008-08-23 02:30:07 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-23 02:30:07 +0000 |
commit | ccd74f888bcb2fe60d14d45bfc9506a2c005aa82 (patch) | |
tree | 5b626ffee4fa08aafa60c5397c1a4e154447546c /OpenSim/Region/Environment | |
parent | Set svn:eol-style (diff) | |
download | opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.zip opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.gz opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.bz2 opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.xz |
Some complex re-ordering to make prebuild do what needed to be done.
It is now possible to use module interfaces without referencing Scene.
Place those interfaces in OpenSim/Region/Interfaces. They may not
use any refs from OpenSim.Region.Environment as parameters.
This resolves a circular library ref introduced in r5949
Diffstat (limited to 'OpenSim/Region/Environment')
6 files changed, 10 insertions, 48 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs b/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs deleted file mode 100644 index 49d096b..0000000 --- a/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
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 | int GetBalance(IClientAPI client); | ||
41 | void ApplyUploadCharge(LLUUID agentID); | ||
42 | bool UploadCovered(IClientAPI client); | ||
43 | |||
44 | event ObjectPaid OnObjectPaid; | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index d8720db..d5e4df7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -32,6 +32,7 @@ using libsecondlife; | |||
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Interfaces; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
37 | 38 | ||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index e31770f..4a6828c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -38,6 +38,7 @@ using Nini.Config; | |||
38 | using Nwc.XmlRpc; | 38 | using Nwc.XmlRpc; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Environment.Interfaces; |
41 | using OpenSim.Region.Interfaces; | ||
41 | using OpenSim.Region.Environment.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
42 | using OpenSim.Framework.Communications.Cache; | 43 | using OpenSim.Framework.Communications.Cache; |
43 | 44 | ||
@@ -54,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
54 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ | 55 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ |
55 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux | 56 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux |
56 | /// </summary> | 57 | /// </summary> |
57 | public class SampleMoneyModule : IMoneyModule | 58 | public class SampleMoneyModule : IMoneyModule, IRegionModule |
58 | { | 59 | { |
59 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
60 | 61 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 9c91725..8382467 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -35,6 +35,7 @@ using libsecondlife.Packets; | |||
35 | using log4net; | 35 | using log4net; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Interfaces; | ||
38 | using OpenSim.Region.Environment.Interfaces; | 39 | using OpenSim.Region.Environment.Interfaces; |
39 | 40 | ||
40 | namespace OpenSim.Region.Environment.Scenes | 41 | namespace OpenSim.Region.Environment.Scenes |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index fb2cbb6..3bae463 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2963,7 +2963,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2963 | /// For the given interface, retrieve the region module which implements it. | 2963 | /// For the given interface, retrieve the region module which implements it. |
2964 | /// </summary> | 2964 | /// </summary> |
2965 | /// <returns>null if there is no module implementing that interface</returns> | 2965 | /// <returns>null if there is no module implementing that interface</returns> |
2966 | public T RequestModuleInterface<T>() | 2966 | public override T RequestModuleInterface<T>() |
2967 | { | 2967 | { |
2968 | if (ModuleInterfaces.ContainsKey(typeof(T))) | 2968 | if (ModuleInterfaces.ContainsKey(typeof(T))) |
2969 | { | 2969 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index fbef367..c624a41 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -220,5 +220,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
220 | 220 | ||
221 | return null; | 221 | return null; |
222 | } | 222 | } |
223 | |||
224 | public virtual T RequestModuleInterface<T>() | ||
225 | { | ||
226 | return default(T); | ||
227 | } | ||
223 | } | 228 | } |
224 | } | 229 | } |