diff options
author | Diva Canto | 2012-11-12 18:23:20 -0800 |
---|---|---|
committer | Diva Canto | 2012-11-12 18:23:20 -0800 |
commit | 48577af3253757061ef1d3d5ff724efd6f8eaeec (patch) | |
tree | c3a2c13647e2e86874ef21df4ede3313dcb8ceb7 /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-48577af3253757061ef1d3d5ff724efd6f8eaeec.zip opensim-SC-48577af3253757061ef1d3d5ff724efd6f8eaeec.tar.gz opensim-SC-48577af3253757061ef1d3d5ff724efd6f8eaeec.tar.bz2 opensim-SC-48577af3253757061ef1d3d5ff724efd6f8eaeec.tar.xz |
More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index acefc97..4ef57fe 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
@@ -41,9 +41,11 @@ using OpenMetaverse; | |||
41 | using OpenMetaverse.Packets; | 41 | using OpenMetaverse.Packets; |
42 | using log4net; | 42 | using log4net; |
43 | using Nini.Config; | 43 | using Nini.Config; |
44 | using Mono.Addins; | ||
44 | 45 | ||
45 | namespace OpenSim.Region.CoreModules.Framework.UserManagement | 46 | namespace OpenSim.Region.CoreModules.Framework.UserManagement |
46 | { | 47 | { |
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGUserManagementModule")] | ||
47 | public class HGUserManagementModule : UserManagementModule, ISharedRegionModule, IUserManagement | 49 | public class HGUserManagementModule : UserManagementModule, ISharedRegionModule, IUserManagement |
48 | { | 50 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index b4811da..86e7004 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -42,6 +42,7 @@ using OpenMetaverse; | |||
42 | using OpenMetaverse.Packets; | 42 | using OpenMetaverse.Packets; |
43 | using log4net; | 43 | using log4net; |
44 | using Nini.Config; | 44 | using Nini.Config; |
45 | using Mono.Addins; | ||
45 | 46 | ||
46 | namespace OpenSim.Region.CoreModules.Framework.UserManagement | 47 | namespace OpenSim.Region.CoreModules.Framework.UserManagement |
47 | { | 48 | { |
@@ -54,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
54 | public Dictionary<string, object> ServerURLs { get; set; } | 55 | public Dictionary<string, object> ServerURLs { get; set; } |
55 | } | 56 | } |
56 | 57 | ||
58 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserManagementModule")] | ||
57 | public class UserManagementModule : ISharedRegionModule, IUserManagement | 59 | public class UserManagementModule : ISharedRegionModule, IUserManagement |
58 | { | 60 | { |
59 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |