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/Modules | |
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/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | 3 |
2 files changed, 3 insertions, 1 deletions
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 | ||