From b40935837c4b227f656c776143d86dc1b91ba5c6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Dec 2014 08:20:17 -0800
Subject: Fixed declaration switcharoo on the region combiner dll.

---
 OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs           | 1 +
 OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 92adf44..0fe3ab0 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -41,6 +41,7 @@ using Mono.Addins;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
     public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 40d6903..07dd68b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
@@ -31,11 +31,9 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Mono.Addins;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
     public class RegionCombinerPermissionModule
     {
         private Scene m_rootScene;
-- 
cgit v1.1