diff options
| author | Melanie | 2010-04-30 11:48:57 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 11:48:57 +0100 |
| commit | 8b70477556a5467868bf6b771da8bb5a366f3160 (patch) | |
| tree | f44e1e120072848270abc38e9eee374b2d5792c0 /OpenSim/Region/CoreModules/World | |
| parent | Fix Av jump motion S/W (diff) | |
| parent | Fix link security issue (diff) | |
| download | opensim-SC_OLD-8b70477556a5467868bf6b771da8bb5a366f3160.zip opensim-SC_OLD-8b70477556a5467868bf6b771da8bb5a366f3160.tar.gz opensim-SC_OLD-8b70477556a5467868bf6b771da8bb5a366f3160.tar.bz2 opensim-SC_OLD-8b70477556a5467868bf6b771da8bb5a366f3160.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -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..86c91ac 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(editorID, 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(editorID, 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) |