aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
diff options
context:
space:
mode:
authorDiva Canto2014-12-30 12:53:31 -0800
committerDiva Canto2014-12-30 12:53:31 -0800
commit7466ef0525f5465596c415684000bd994055b280 (patch)
treecd2566d4ab7e45f88476359a66658a8ea0dce012 /OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7466ef0525f5465596c415684000bd994055b280.zip
opensim-SC_OLD-7466ef0525f5465596c415684000bd994055b280.tar.gz
opensim-SC_OLD-7466ef0525f5465596c415684000bd994055b280.tar.bz2
opensim-SC_OLD-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 'OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs4
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;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using Mono.Addins;
34 35
35namespace OpenSim.Region.RegionCombinerModule 36namespace 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