diff options
| author | Melanie | 2010-04-30 12:06:58 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 12:06:58 +0100 |
| commit | 9500ba2ff59fc2a47136337a2b06c000b420fd78 (patch) | |
| tree | aad4857fc25b75811cd19819c6a0bd811edc5d90 /OpenSim | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC-9500ba2ff59fc2a47136337a2b06c000b420fd78.zip opensim-SC-9500ba2ff59fc2a47136337a2b06c000b420fd78.tar.gz opensim-SC-9500ba2ff59fc2a47136337a2b06c000b420fd78.tar.bz2 opensim-SC-9500ba2ff59fc2a47136337a2b06c000b420fd78.tar.xz | |
Fix some symbol errors
Diffstat (limited to '')
| -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 86c91ac..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 GenericObjectPermission(editorID, objectID, false); | 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 GenericObjectPermission(editorID, objectID, false); | 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) |