From 1f18ce516fe203aaa7a51d3f70d7fff5f6c8a423 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 7 Sep 2012 11:04:00 -0400
Subject: Move addin information to RegionCombinerModule.addin.xml

  Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
---
 .../Region/RegionCombinerModule/RegionCombinerModule.cs    |  4 +---
 .../Resources/RegionCombinerModule.addin.xml               | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml

(limited to 'OpenSim/Region')

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;
 using OpenSim.Region.Physics.Manager;
 using Mono.Addins;
 
-[assembly: Addin("RegionCombinerModule", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+
 namespace OpenSim.Region.RegionCombinerModule
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule
     {
         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 @@
+<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>
+
-- 
cgit v1.1