This cleans up versioning. Specifically:

- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.

3 files changed, 6 insertions, 15 deletions

diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index 78bb186..9a07c5e 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
 //
 [assembly: AssemblyVersion("0.8.1.*")]
 
+[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 7c662c9..40d6903 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
@@ -31,10 +31,12 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
- public class RegionCombinerPermissionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
+    public class RegionCombinerPermissionModule
     {
         private Scene m_rootScene;
 
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
deleted file mode 100644
index 5891903..0000000
--- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Addin id="OpenSim.RegionModules.RegionCombinerModule" version="0.3">
-    <Runtime>
-        <Import assembly="OpenSim.Region.RegionCombinerModule.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.8.1" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule.RegionCombinerModule" />
-    </Extension>
-
-</Addin>