diff options
author | Diva Canto | 2014-12-30 12:53:31 -0800 |
---|---|---|
committer | Diva Canto | 2014-12-30 12:53:31 -0800 |
commit | 7466ef0525f5465596c415684000bd994055b280 (patch) | |
tree | cd2566d4ab7e45f88476359a66658a8ea0dce012 /OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-7466ef0525f5465596c415684000bd994055b280.zip opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.gz opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.bz2 opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.xz |
This cleans up versioning. Specifically:
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs index 7c662c9..40d6903 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | |||
@@ -31,10 +31,12 @@ 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; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.RegionCombinerModule | 36 | namespace OpenSim.Region.RegionCombinerModule |
36 | { | 37 | { |
37 | public class RegionCombinerPermissionModule | 38 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")] |
39 | public class RegionCombinerPermissionModule | ||
38 | { | 40 | { |
39 | private Scene m_rootScene; | 41 | private Scene m_rootScene; |
40 | 42 | ||