diff options
| author | BlueWall | 2012-09-07 11:39:30 -0400 |
|---|---|---|
| committer | BlueWall | 2012-09-07 11:41:47 -0400 |
| commit | 550f6c4ad22b28f7d1722a92472827c199152893 (patch) | |
| tree | 80a1071280e447886b87bf4c72b4b4d79520453e /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
| parent | Move addin information to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-550f6c4ad22b28f7d1722a92472827c199152893.zip opensim-SC-550f6c4ad22b28f7d1722a92472827c199152893.tar.gz opensim-SC-550f6c4ad22b28f7d1722a92472827c199152893.tar.bz2 opensim-SC-550f6c4ad22b28f7d1722a92472827c199152893.tar.xz | |
Revert "Move addin information to RegionCombinerModule.addin.xml"
This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8.
Need to look into this
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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; | |||
| 39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
| 40 | using Mono.Addins; | 40 | using Mono.Addins; |
| 41 | 41 | ||
| 42 | 42 | [assembly: Addin("RegionCombinerModule", "0.1")] | |
| 43 | [assembly: AddinDependency("OpenSim", "0.5")] | ||
| 43 | namespace OpenSim.Region.RegionCombinerModule | 44 | namespace OpenSim.Region.RegionCombinerModule |
| 44 | { | 45 | { |
| 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
| 45 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule | 47 | public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule |
| 46 | { | 48 | { |
| 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |