diff options
| author | Melanie | 2010-04-30 11:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 11:49:16 +0100 |
| commit | 7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch) | |
| tree | 284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Treat a UserLevel of -1 as an unverified account and refer them to their (diff) | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.zip opensim-SC-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.gz opensim-SC-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.bz2 opensim-SC-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 01359f0..b0bb810 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1721,7 +1721,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1721 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1721 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1722 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1722 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1723 | 1723 | ||
| 1724 | return true; | 1724 | return GenericObjectPermission(editorID, objectID, false); |
| 1725 | } | 1725 | } |
| 1726 | 1726 | ||
| 1727 | private bool CanDelinkObject(UUID userID, UUID objectID) | 1727 | private bool CanDelinkObject(UUID userID, UUID objectID) |
| @@ -1729,7 +1729,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1729 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1729 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1730 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1730 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1731 | 1731 | ||
| 1732 | return true; | 1732 | return GenericObjectPermission(editorID, objectID, false); |
| 1733 | } | 1733 | } |
| 1734 | 1734 | ||
| 1735 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) | 1735 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) |