aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-09-07 11:39:30 -0400
committerBlueWall2012-09-07 11:41:47 -0400
commit550f6c4ad22b28f7d1722a92472827c199152893 (patch)
tree80a1071280e447886b87bf4c72b4b4d79520453e /OpenSim
parentMove addin information to RegionCombinerModule.addin.xml (diff)
downloadopensim-SC_OLD-550f6c4ad22b28f7d1722a92472827c199152893.zip
opensim-SC_OLD-550f6c4ad22b28f7d1722a92472827c199152893.tar.gz
opensim-SC_OLD-550f6c4ad22b28f7d1722a92472827c199152893.tar.bz2
opensim-SC_OLD-550f6c4ad22b28f7d1722a92472827c199152893.tar.xz
Revert "Move addin information to RegionCombinerModule.addin.xml"
This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8. Need to look into this
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs4
-rw-r--r--OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml14
2 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 7a49cd8..3144d76 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -39,9 +39,11 @@ using OpenSim.Framework.Console;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40using Mono.Addins; 40using Mono.Addins;
41 41
42 42[assembly: Addin("RegionCombinerModule", "0.1")]
43[assembly: AddinDependency("OpenSim", "0.5")]
43namespace OpenSim.Region.RegionCombinerModule 44namespace OpenSim.Region.RegionCombinerModule
44{ 45{
46 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
45 public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule 47 public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule
46 { 48 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 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
deleted file mode 100644
index 6101e63..0000000
--- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
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