OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make object return actually use the CanReturnObject permission, rather than 

the CanDelete one.
0.6.1-post-fixes
Melanie Thielker 2008-12-11 01:03:53 +00:00
parent 7f80eff067
commit 2101680094
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1709,23 +1709,17 @@ namespace OpenSim.Region.Environment.Scenes
Permissions.CanDeleteObject( Permissions.CanDeleteObject(
grp.UUID, grp.UUID,
remoteClient.AgentId); remoteClient.AgentId);
permissionToDelete = permissionToDelete = permissionToTake;
Permissions.CanDeleteObject(
grp.UUID,
remoteClient.AgentId);
} }
else if (action == DeRezAction.Return) else if (action == DeRezAction.Return)
{ {
if (remoteClient != null) if (remoteClient != null)
{ {
permissionToTake = permissionToTake =
Permissions.CanDeleteObject( Permissions.CanReturnObject(
grp.UUID,
remoteClient.AgentId);
permissionToDelete =
Permissions.CanDeleteObject(
grp.UUID, grp.UUID,
remoteClient.AgentId); remoteClient.AgentId);
permissionToDelete = permissionToTake;
if (permissionToDelete) if (permissionToDelete)
{ {
AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return"); AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");