diff options
| author | Justin Clark-Casey (justincc) | 2010-05-03 21:36:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-03 21:36:04 +0100 |
| commit | 087f47589383ab63760c143f4e7ab3dbe043b325 (patch) | |
| tree | da0a61bb03b5444610075e1c1102c3fee72b5313 /OpenSim/Region/CoreModules | |
| parent | Address symptom of Mantis 4588 (though not the cause) by moving the avatar de... (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC-087f47589383ab63760c143f4e7ab3dbe043b325.zip opensim-SC-087f47589383ab63760c143f4e7ab3dbe043b325.tar.gz opensim-SC-087f47589383ab63760c143f4e7ab3dbe043b325.tar.bz2 opensim-SC-087f47589383ab63760c143f4e7ab3dbe043b325.tar.xz | |
Merge branch '0.6.9-post-fixes' into 0.6.9
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 1533462..b557186 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1592,7 +1592,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1592 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1592 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1593 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1593 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1594 | 1594 | ||
| 1595 | return true; | 1595 | return GenericObjectPermission(userID, objectID, false); |
| 1596 | } | 1596 | } |
| 1597 | 1597 | ||
| 1598 | private bool CanDelinkObject(UUID userID, UUID objectID) | 1598 | private bool CanDelinkObject(UUID userID, UUID objectID) |
| @@ -1600,7 +1600,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1600 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1600 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1601 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1601 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1602 | 1602 | ||
| 1603 | return true; | 1603 | return GenericObjectPermission(userID, objectID, false); |
| 1604 | } | 1604 | } |
| 1605 | 1605 | ||
| 1606 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) | 1606 | private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) |