From 7466ef0525f5465596c415684000bd994055b280 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Dec 2014 12:53:31 -0800
Subject: 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.
---
OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | 4 +-
.../Addons/OfflineIM/Properties/AssemblyInfo.cs | 4 +-
.../LoadRegions/Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../RemoteController/Properties/AssemblyInfo.cs | 4 +-
OpenSim/Framework/Servers/VersionInfo.cs | 76 ----------------------
OpenSim/Framework/VersionInfo.cs | 76 ++++++++++++++++++++++
.../Region/Application/Properties/AssemblyInfo.cs | 2 +-
.../Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs | 4 +-
.../Region/CoreModules/Properties/AssemblyInfo.cs | 4 +-
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 4 +-
.../Region/Framework/Properties/AssemblyInfo.cs | 2 +-
.../OptionalModules/Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 3 +
.../RegionCombinerPermissionModule.cs | 4 +-
.../Resources/RegionCombinerModule.addin.xml | 14 ----
.../XEngine/Properties/AssemblyInfo.cs | 3 +
.../XEngine/Resources/XEngine.addin.xml | 13 ----
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 +
OpenSim/Region/UserStatistics/WebStatsModule.cs | 4 +-
.../Services/Connectors/SimianGrid/SimianGrid.cs | 4 +-
21 files changed, 111 insertions(+), 128 deletions(-)
delete mode 100644 OpenSim/Framework/Servers/VersionInfo.cs
create mode 100644 OpenSim/Framework/VersionInfo.cs
delete mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
delete mode 100644 OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
(limited to 'OpenSim')
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
index aa31a14..de3dfd0 100644
--- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.Groups", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
index 054e1fb..59758ff 100644
--- a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.OfflineIM", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
index d289e78..ce93010 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -65,5 +65,5 @@ using Mono.Addins;
[assembly : AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
index edef4d5..40f184c 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
index 7e9f6eb..cc7746a 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
deleted file mode 100644
index 469577e..0000000
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace OpenSim
-{
- public class VersionInfo
- {
- private const string VERSION_NUMBER = "0.8.1";
- private const Flavour VERSION_FLAVOUR = Flavour.Dev;
-
- public enum Flavour
- {
- Unknown,
- Dev,
- RC1,
- RC2,
- RC3,
- Release,
- Post_Fixes,
- Extended
- }
-
- public static string Version
- {
- get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR); }
- }
-
- public static string GetVersionString(string versionNumber, Flavour flavour)
- {
- string versionString = "OpenSim " + versionNumber + " " + flavour;
- return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
- }
-
- public const int VERSIONINFO_VERSION_LENGTH = 27;
-
- ///
- /// This is the external interface version. It is separate from the OpenSimulator project version.
- ///
- /// This version number should be
- /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible
- /// with the new revision. This will usually be due to interregion or grid facing interface changes.
- ///
- /// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
- /// but not outright failure) do not need a version number increment.
- ///
- /// Having this version number allows the grid service to reject connections from regions running a version
- /// of the code that is too old.
- ///
- ///
- public readonly static int MajorInterfaceVersion = 7;
- }
-}
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
new file mode 100644
index 0000000..6ce668a
--- /dev/null
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OpenSim
+{
+ public class VersionInfo
+ {
+ public const string VERSION_NUMBER = "0.8.1.0";
+ private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+
+ public enum Flavour
+ {
+ Unknown,
+ Dev,
+ RC1,
+ RC2,
+ RC3,
+ Release,
+ Post_Fixes,
+ Extended
+ }
+
+ public static string Version
+ {
+ get { return GetVersionString(VERSION_NUMBER, VERSION_FLAVOUR); }
+ }
+
+ public static string GetVersionString(string versionNumber, Flavour flavour)
+ {
+ string versionString = "OpenSim " + versionNumber + " " + flavour;
+ return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
+ }
+
+ public const int VERSIONINFO_VERSION_LENGTH = 27;
+
+ ///
+ /// This is the external interface version. It is separate from the OpenSimulator project version.
+ ///
+ /// This version number should be
+ /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible
+ /// with the new revision. This will usually be due to interregion or grid facing interface changes.
+ ///
+ /// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
+ /// but not outright failure) do not need a version number increment.
+ ///
+ /// Having this version number allows the grid service to reject connections from regions running a version
+ /// of the code that is too old.
+ ///
+ ///
+ public readonly static int MajorInterfaceVersion = 7;
+ }
+}
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 3e61575..9d186e8 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AddinRoot("OpenSim", "0.8.1")]
+[assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: ImportAddinAssembly("Opensim.Framework.dll")]
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index b05af22..d7287cc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Capabilities.Caps;
-[assembly: Addin("LindenCaps", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.ClientStack.Linden
{
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 8cafa12..03f4b2f 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.Region.CoreModules", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 9d3ae5e..4a3f821 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -42,8 +42,8 @@ using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
-[assembly: Addin("DataSnapshot", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("DataSnapshot", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.DataSnapshot
{
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index 6fe2892..1dbe063 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AddinRoot("OpenSim.Region.Framework", "0.8.1")]
+[assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 3f53229..3578266 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.Region.OptionalModules", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index 12ca3d6..daf73a8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/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.Region.ScriptEngine.XEngine", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml b/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
deleted file mode 100644
index eb18bf7..0000000
--- a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 906c6ee..f87d631 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -42,6 +42,7 @@ using OpenMetaverse.StructuredData;
using log4net;
using Nini.Config;
using Amib.Threading;
+using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Scenes;
@@ -60,6 +61,7 @@ using ScriptCompileQueue = OpenSim.Framework.LocklessQueue;
namespace OpenSim.Region.ScriptEngine.XEngine
{
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEngine")]
public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 57a2502..b769360 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -50,8 +50,8 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using OSD = OpenMetaverse.StructuredData.OSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-[assembly: Addin("WebStats", "1.0")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("WebStats", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.UserStatistics
{
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index 46fda23..88edca1 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -39,8 +39,8 @@ using OpenSim.Services.Interfaces;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
-[assembly: Addin("SimianGrid", "1.0")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("SimianGrid", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Services.Connectors.SimianGrid
{
--
cgit v1.1