From 550f6c4ad22b28f7d1722a92472827c199152893 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 7 Sep 2012 11:39:30 -0400
Subject: Revert "Move addin information to RegionCombinerModule.addin.xml"

This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8.
  Need to look into this
---
 .../Region/RegionCombinerModule/RegionCombinerModule.cs    |  4 +++-
 .../Resources/RegionCombinerModule.addin.xml               | 14 --------------
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete 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 7a49cd8..3144d76 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -39,9 +39,11 @@ 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
deleted file mode 100644
index 6101e63..0000000
--- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
+++ /dev/null
@@ -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>
-
-- 
cgit v1.1