ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-30 11:49:16 +01:00
parent 9c79fd6308 8b70477556
commit 7dc5ebc929
7 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -1721,7 +1721,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
return true;
return GenericObjectPermission(editorID, objectID, false);
}
private bool CanDelinkObject(UUID userID, UUID objectID)
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
return true;
return GenericObjectPermission(editorID, objectID, false);
}
private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene)