diff options
| author | Melanie | 2013-09-16 22:32:53 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-16 22:32:53 +0100 |
| commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
| tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
| download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index f8e93e1..50855fe 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -42,8 +42,8 @@ using PermissionMask = OpenSim.Framework.PermissionMask; | |||
| 42 | 42 | ||
| 43 | namespace OpenSim.Region.CoreModules.World.Permissions | 43 | namespace OpenSim.Region.CoreModules.World.Permissions |
| 44 | { | 44 | { |
| 45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PermissionsModule")] | 45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultPermissionsModule")] |
| 46 | public class PermissionsModule : INonSharedRegionModule, IPermissionsModule | 46 | public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule |
| 47 | { | 47 | { |
| 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 49 | 49 | ||
| @@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 348 | 348 | ||
| 349 | public string Name | 349 | public string Name |
| 350 | { | 350 | { |
| 351 | get { return "PermissionsModule"; } | 351 | get { return "DefaultPermissionsModule"; } |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | public Type ReplaceableInterface | 354 | public Type ReplaceableInterface |