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. --- OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs') diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 3144d76..7a49cd8 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs @@ -39,11 +39,9 @@ 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); -- 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 --- OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs') 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); -- 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. --- OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 3 --- 1 file changed, 3 deletions(-) (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs') diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 3144d76..190fca0 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs @@ -39,11 +39,8 @@ 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); -- cgit v1.1