diff options
author | BlueWall | 2012-09-07 11:04:00 -0400 |
---|---|---|
committer | BlueWall | 2012-09-07 11:07:19 -0400 |
commit | 1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423 (patch) | |
tree | 0954bddf7a48b0b296711f3f59578c3a7e00ba13 | |
parent | Move addin information to CoreModulePlugin.addin.xml (diff) | |
download | opensim-SC-1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423.zip opensim-SC-1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423.tar.gz opensim-SC-1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423.tar.bz2 opensim-SC-1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423.tar.xz |
Move addin information to RegionCombinerModule.addin.xml
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 3144d76..7a49cd8 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -39,11 +39,9 @@ using OpenSim.Framework.Console; | |||
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
40 | using Mono.Addins; | 40 | using Mono.Addins; |
41 | 41 | ||
42 | [assembly: Addin("RegionCombinerModule", "0.1")] | 42 | |
43 | [assembly: AddinDependency("OpenSim", "0.5")] | ||
44 | namespace OpenSim.Region.RegionCombinerModule | 43 | namespace OpenSim.Region.RegionCombinerModule |
45 | { | 44 | { |
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
47 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule | 45 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule |
48 | { | 46 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml new file mode 100644 index 0000000..6101e63 --- /dev/null +++ b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | |||
@@ -0,0 +1,14 @@ | |||
1 | <Addin id="RegionCombinerModule" version="0.2"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Region.RegionCombinerModule.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.5" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/RegionModules"> | ||
11 | <RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule" /> | ||
12 | </Extension> | ||
13 | </Addin> | ||
14 | |||