diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs index aa31a14d40..de3dfd09ad 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 054e1fb2e3..59758ff96c 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 d289e782ca..ce930102a6 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 edef4d50c6..40f184c3df 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 7e9f6ebc72..cc7746aead 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/VersionInfo.cs similarity index 98% rename from OpenSim/Framework/Servers/VersionInfo.cs rename to OpenSim/Framework/VersionInfo.cs index 469577e276..6ce668a81f 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs @@ -29,7 +29,7 @@ namespace OpenSim { public class VersionInfo { - private const string VERSION_NUMBER = "0.8.1"; + public const string VERSION_NUMBER = "0.8.1.0"; private const Flavour VERSION_FLAVOUR = Flavour.Dev; public enum Flavour diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs index 3e61575c44..9d186e821c 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 b05af223a1..d7287cc577 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 8cafa12856..03f4b2fed2 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 9d3ae5eafe..4a3f8215d2 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 6fe28920f6..1dbe063e92 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 3f53229431..3578266095 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 78bb186d66..9a07c5e32b 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 7c662c9b3a..40d6903576 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 58919038b6..0000000000 --- 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 12ca3d612a..daf73a88a8 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 eb18bf7fcf..0000000000 --- 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 906c6ee298..f87d631d70 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 57a2502528..b7693601c6 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 46fda232a7..88edca1750 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 { diff --git a/prebuild.xml b/prebuild.xml index a9a7cfcf73..663d4da2bb 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -2355,6 +2355,7 @@ +