diff options
| author | Diva Canto | 2014-12-31 08:20:17 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-12-31 08:20:17 -0800 |
| commit | b40935837c4b227f656c776143d86dc1b91ba5c6 (patch) | |
| tree | d1d578a75ccbf471c2c49a3552951eb329cc2e6a /OpenSim/Region | |
| parent | Commenting out the suppression of console warnings from Mono addins while we ... (diff) | |
| download | opensim-SC-b40935837c4b227f656c776143d86dc1b91ba5c6.zip opensim-SC-b40935837c4b227f656c776143d86dc1b91ba5c6.tar.gz opensim-SC-b40935837c4b227f656c776143d86dc1b91ba5c6.tar.bz2 opensim-SC-b40935837c4b227f656c776143d86dc1b91ba5c6.tar.xz | |
Fixed declaration switcharoo on the region combiner dll.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | 2 |
2 files changed, 1 insertions, 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; | |||
| 41 | 41 | ||
| 42 | namespace OpenSim.Region.RegionCombinerModule | 42 | namespace OpenSim.Region.RegionCombinerModule |
| 43 | { | 43 | { |
| 44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")] | ||
| 44 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule | 45 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule |
| 45 | { | 46 | { |
| 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | 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; | |||
| 31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
| 32 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
| 33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
| 34 | using Mono.Addins; | ||
| 35 | 34 | ||
| 36 | namespace OpenSim.Region.RegionCombinerModule | 35 | namespace OpenSim.Region.RegionCombinerModule |
| 37 | { | 36 | { |
| 38 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")] | ||
| 39 | public class RegionCombinerPermissionModule | 37 | public class RegionCombinerPermissionModule |
| 40 | { | 38 | { |
| 41 | private Scene m_rootScene; | 39 | private Scene m_rootScene; |