OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Move addin information to RegionCombinerModule.addin.xml" 

This reverts commit ab446bc692.
  Need to look into this
integration
BlueWall 2012-09-07 11:39:30 -04:00
parent ab446bc692
commit c713c8585d
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@ -39,9 +39,11 @@ using OpenSim.Framework.Console;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using Mono.Addins; using Mono.Addins;
[assembly: Addin("RegionCombinerModule", "0.1")]
[assembly: AddinDependency("OpenSim", "0.5")]
namespace OpenSim.Region.RegionCombinerModule namespace OpenSim.Region.RegionCombinerModule
{ {
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

14
OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
View File

@ -1,14 +0,0 @@
<Addin id="RegionCombinerModule" version="0.2">
<Runtime>
<Import assembly="OpenSim.Region.RegionCombinerModule.dll"/>
</Runtime>
<Dependencies>
<Addin id="OpenSim" version="0.5" />
</Dependencies>
<Extension path = "/OpenSim/RegionModules">
<RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule" />
</Extension>
</Addin>