Fixes the obvious problem in mantis #4841. Melanie needs to look at other potential problems there, though.
parent
ed84963ef6
commit
863462dbb8
|
@ -1608,7 +1608,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (action == DeRezAction.SaveToExistingUserInventoryItem)
|
if (action == DeRezAction.SaveToExistingUserInventoryItem)
|
||||||
permissionToDelete = false;
|
permissionToDelete = false;
|
||||||
|
|
||||||
// if we want to take a copy,, we also don't want to delete
|
// if we want to take a copy, we also don't want to delete
|
||||||
// Note: after this point, the permissionToTakeCopy flag
|
// Note: after this point, the permissionToTakeCopy flag
|
||||||
// becomes irrelevant. It already includes the permissionToTake
|
// becomes irrelevant. It already includes the permissionToTake
|
||||||
// permission and after excluding no copy items here, we can
|
// permission and after excluding no copy items here, we can
|
||||||
|
@ -1619,6 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (!permissionToTakeCopy)
|
if (!permissionToTakeCopy)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
permissionToTake = true;
|
||||||
// Don't delete
|
// Don't delete
|
||||||
permissionToDelete = false;
|
permissionToDelete = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue