diff options
| author | sacha | 2010-05-02 08:18:33 -0400 |
|---|---|---|
| committer | sacha | 2010-05-02 08:18:33 -0400 |
| commit | 5f6e9e6ab954518e45fd47434a17686f925941f4 (patch) | |
| tree | 46e35df9931238dba4d45354e54e0b1f78f34dca /OpenSim/Region/CoreModules | |
| parent | Adding DebugEvent Trap (diff) | |
| parent | Fix linking issue introduced in my earlier commit (diff) | |
| download | opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.zip opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.gz opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.bz2 opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 7159dc6..212cfee 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1594,7 +1594,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1594 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1594 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1595 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1595 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1596 | 1596 | ||
| 1597 | return true; | 1597 | return GenericObjectPermission(userID, objectID, false); |
| 1598 | } | 1598 | } |
| 1599 | 1599 | ||
| 1600 | private bool CanDelinkObject(UUID userID, UUID objectID) | 1600 | private bool CanDelinkObject(UUID userID, UUID objectID) |
| @@ -1602,7 +1602,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1602 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1602 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1603 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1603 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1604 | 1604 | ||
| 1605 | return true; | 1605 | return GenericObjectPermission(userID, objectID, false); |
| 1606 | } | 1606 | } |
| 1607 | 1607 | ||
| 1608 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) | 1608 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) |