diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 489b8ca..b859042 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1633,7 +1633,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1633 | if (action == DeRezAction.SaveToExistingUserInventoryItem) | 1633 | if (action == DeRezAction.SaveToExistingUserInventoryItem) |
1634 | permissionToDelete = false; | 1634 | permissionToDelete = false; |
1635 | 1635 | ||
1636 | // if we want to take a copy,, we also don't want to delete | 1636 | // if we want to take a copy, we also don't want to delete |
1637 | // Note: after this point, the permissionToTakeCopy flag | 1637 | // Note: after this point, the permissionToTakeCopy flag |
1638 | // becomes irrelevant. It already includes the permissionToTake | 1638 | // becomes irrelevant. It already includes the permissionToTake |
1639 | // permission and after excluding no copy items here, we can | 1639 | // permission and after excluding no copy items here, we can |
@@ -1644,6 +1644,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1644 | if (!permissionToTakeCopy) | 1644 | if (!permissionToTakeCopy) |
1645 | return; | 1645 | return; |
1646 | 1646 | ||
1647 | permissionToTake = true; | ||
1647 | // Don't delete | 1648 | // Don't delete |
1648 | permissionToDelete = false; | 1649 | permissionToDelete = false; |
1649 | } | 1650 | } |