diff options
| author | Diva Canto | 2012-09-07 08:10:03 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-07 08:10:03 -0700 |
| commit | 2b506cffb16729837fc2ec41a28fef8feaf6428d (patch) | |
| tree | 009a47a191a87525a0817edd1f8fdde9b2058b31 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
| parent | Moved the new vars in Robust.HG.ini to the proper section. (diff) | |
| parent | Move addin information to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-2b506cffb16729837fc2ec41a28fef8feaf6428d.zip opensim-SC-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.gz opensim-SC-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.bz2 opensim-SC-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
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; | |||
| 39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
| 40 | using Mono.Addins; | 40 | using Mono.Addins; |
| 41 | 41 | ||
| 42 | [assembly: Addin("RegionCombinerModule", "0.1")] | 42 | |
| 43 | [assembly: AddinDependency("OpenSim", "0.5")] | ||
| 44 | namespace OpenSim.Region.RegionCombinerModule | 43 | namespace OpenSim.Region.RegionCombinerModule |
| 45 | { | 44 | { |
| 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
| 47 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule | 45 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule |
| 48 | { | 46 | { |
| 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |