aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-11 01:03:53 +0000
committerMelanie Thielker2008-12-11 01:03:53 +0000
commit21016800948df8c94fd6b75babbe7c384291b3ed (patch)
tree5ba72a3ff2c9a00721203f01d4454efb1dc944b5
parent* Committing a slightly distilled version of nlin's ODECharacter race conditi... (diff)
downloadopensim-SC_OLD-21016800948df8c94fd6b75babbe7c384291b3ed.zip
opensim-SC_OLD-21016800948df8c94fd6b75babbe7c384291b3ed.tar.gz
opensim-SC_OLD-21016800948df8c94fd6b75babbe7c384291b3ed.tar.bz2
opensim-SC_OLD-21016800948df8c94fd6b75babbe7c384291b3ed.tar.xz
Make object return actually use the CanReturnObject permission, rather than
the CanDelete one.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 586fa43..335f247 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1709,23 +1709,17 @@ namespace OpenSim.Region.Environment.Scenes
1709 Permissions.CanDeleteObject( 1709 Permissions.CanDeleteObject(
1710 grp.UUID, 1710 grp.UUID,
1711 remoteClient.AgentId); 1711 remoteClient.AgentId);
1712 permissionToDelete = 1712 permissionToDelete = permissionToTake;
1713 Permissions.CanDeleteObject(
1714 grp.UUID,
1715 remoteClient.AgentId);
1716 } 1713 }
1717 else if (action == DeRezAction.Return) 1714 else if (action == DeRezAction.Return)
1718 { 1715 {
1719 if (remoteClient != null) 1716 if (remoteClient != null)
1720 { 1717 {
1721 permissionToTake = 1718 permissionToTake =
1722 Permissions.CanDeleteObject( 1719 Permissions.CanReturnObject(
1723 grp.UUID,
1724 remoteClient.AgentId);
1725 permissionToDelete =
1726 Permissions.CanDeleteObject(
1727 grp.UUID, 1720 grp.UUID,
1728 remoteClient.AgentId); 1721 remoteClient.AgentId);
1722 permissionToDelete = permissionToTake;
1729 if (permissionToDelete) 1723 if (permissionToDelete)
1730 { 1724 {
1731 AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return"); 1725 AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");