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.
---
 .../Resources/RegionCombinerModule.addin.xml               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml

(limited to 'OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml')

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


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
---
 .../Resources/RegionCombinerModule.addin.xml               | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml

(limited to 'OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml')

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


From 717b11856ed61b9322503fcb6700e3c66d3a697e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 7 Sep 2012 12:54:12 -0400
Subject: Move addin attributes to RegionCombinerModule.addin.xml

  Will help in automation of setting version info for addin dependencies.
---
 .../Resources/RegionCombinerModule.addin.xml               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml

(limited to 'OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml')

diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
new file mode 100644
index 0000000..13cb8b6
--- /dev/null
+++ b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
@@ -0,0 +1,14 @@
+<Addin id="OpenSim.RegionModules.RegionCombinerModule" version="0.3">
+    <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.RegionCombinerModule" />
+    </Extension>
+
+</Addin>
-- 
cgit v1.1