diff options
author | Melanie | 2012-11-13 02:28:40 +0000 |
---|---|---|
committer | Melanie | 2012-11-13 02:28:40 +0000 |
commit | 29bfd9e46c50efc8cc4866b9babd2c5c07cb4d5e (patch) | |
tree | a2f2674327e3de5f058ee90d36667e256fe43f47 | |
parent | Merge branch 'master' into careminster (diff) | |
parent | More module cleanup: removed the CoreModules.Framework modules directives out... (diff) | |
download | opensim-SC_OLD-29bfd9e46c50efc8cc4866b9babd2c5c07cb4d5e.zip opensim-SC_OLD-29bfd9e46c50efc8cc4866b9babd2c5c07cb4d5e.tar.gz opensim-SC_OLD-29bfd9e46c50efc8cc4866b9babd2c5c07cb4d5e.tar.bz2 opensim-SC_OLD-29bfd9e46c50efc8cc4866b9babd2c5c07cb4d5e.tar.xz |
Merge branch 'master' into careminster
7 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 31e6ce9..7e72d47 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -43,9 +43,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
43 | using OpenMetaverse; | 43 | using OpenMetaverse; |
44 | using log4net; | 44 | using log4net; |
45 | using Nini.Config; | 45 | using Nini.Config; |
46 | using Mono.Addins; | ||
46 | 47 | ||
47 | namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | 48 | namespace OpenSim.Region.CoreModules.Framework.EntityTransfer |
48 | { | 49 | { |
50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")] | ||
49 | public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule | 51 | public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule |
50 | { | 52 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index b16c37a..f3a0b01 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -42,9 +42,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
42 | using OpenMetaverse; | 42 | using OpenMetaverse; |
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.EntityTransfer | 47 | namespace OpenSim.Region.CoreModules.Framework.EntityTransfer |
47 | { | 48 | { |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGEntityTransferModule")] | ||
48 | public class HGEntityTransferModule | 50 | public class HGEntityTransferModule |
49 | : EntityTransferModule, INonSharedRegionModule, IEntityTransferModule, IUserAgentVerificationModule | 51 | : EntityTransferModule, INonSharedRegionModule, IEntityTransferModule, IUserAgentVerificationModule |
50 | { | 52 | { |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 6bb758e..964efda 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -42,9 +42,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
42 | using OpenMetaverse; | 42 | using OpenMetaverse; |
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.InventoryAccess | 47 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess |
47 | { | 48 | { |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGInventoryAccessModule")] | ||
48 | public class HGInventoryAccessModule : BasicInventoryAccessModule, INonSharedRegionModule, IInventoryAccessModule | 50 | public class HGInventoryAccessModule : BasicInventoryAccessModule, INonSharedRegionModule, IInventoryAccessModule |
49 | { | 51 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 50f5f68..6e5a4a5 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -46,9 +46,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
46 | using OpenMetaverse; | 46 | using OpenMetaverse; |
47 | using log4net; | 47 | using log4net; |
48 | using Nini.Config; | 48 | using Nini.Config; |
49 | using Mono.Addins; | ||
49 | 50 | ||
50 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | 51 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess |
51 | { | 52 | { |
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicInventoryAccessModule")] | ||
52 | public class BasicInventoryAccessModule : INonSharedRegionModule, IInventoryAccessModule | 54 | public class BasicInventoryAccessModule : INonSharedRegionModule, IInventoryAccessModule |
53 | { | 55 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 56 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
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); |
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 81f1ff6..fee1d5f 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -8,12 +8,6 @@ | |||
8 | </Dependencies> | 8 | </Dependencies> |
9 | 9 | ||
10 | <Extension path = "/OpenSim/RegionModules"> | 10 | <Extension path = "/OpenSim/RegionModules"> |
11 | <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" /> | ||
12 | <RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" /> | ||
13 | <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" /> | ||
14 | <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" /> | ||
15 | <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" /> | ||
16 | <RegionModule id="HGInventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" /> | ||
17 | <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" /> | 11 | <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" /> |
18 | <RegionModule id="DwellModule" type="OpenSim.Region.CoreModules.World.Land.DwellModule" /> | 12 | <RegionModule id="DwellModule" type="OpenSim.Region.CoreModules.World.Land.DwellModule" /> |
19 | <RegionModule id="PrimCountModule" type="OpenSim.Region.CoreModules.World.Land.PrimCountModule" /> | 13 | <RegionModule id="PrimCountModule" type="OpenSim.Region.CoreModules.World.Land.PrimCountModule" /> |