diff options
author | Diva Canto | 2010-07-04 02:59:38 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-04 03:01:09 -0700 |
commit | 863462dbb8b5de782db7dd7c5b761a6daa8bdb97 (patch) | |
tree | e0d6d4ae83faaf47aaccae1b0d2f7d290e6703dd /OpenSim/Region/Framework | |
parent | Compiled Robust.32BitLaunch.exe to .Net 3.5 (diff) | |
download | opensim-SC_OLD-863462dbb8b5de782db7dd7c5b761a6daa8bdb97.zip opensim-SC_OLD-863462dbb8b5de782db7dd7c5b761a6daa8bdb97.tar.gz opensim-SC_OLD-863462dbb8b5de782db7dd7c5b761a6daa8bdb97.tar.bz2 opensim-SC_OLD-863462dbb8b5de782db7dd7c5b761a6daa8bdb97.tar.xz |
Fixes the obvious problem in mantis #4841. Melanie needs to look at other potential problems there, though.
Diffstat (limited to '')
-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 f9da341..56d8a78 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1608,7 +1608,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1608 | if (action == DeRezAction.SaveToExistingUserInventoryItem) | 1608 | if (action == DeRezAction.SaveToExistingUserInventoryItem) |
1609 | permissionToDelete = false; | 1609 | permissionToDelete = false; |
1610 | 1610 | ||
1611 | // if we want to take a copy,, we also don't want to delete | 1611 | // if we want to take a copy, we also don't want to delete |
1612 | // Note: after this point, the permissionToTakeCopy flag | 1612 | // Note: after this point, the permissionToTakeCopy flag |
1613 | // becomes irrelevant. It already includes the permissionToTake | 1613 | // becomes irrelevant. It already includes the permissionToTake |
1614 | // permission and after excluding no copy items here, we can | 1614 | // permission and after excluding no copy items here, we can |
@@ -1619,6 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1619 | if (!permissionToTakeCopy) | 1619 | if (!permissionToTakeCopy) |
1620 | return; | 1620 | return; |
1621 | 1621 | ||
1622 | permissionToTake = true; | ||
1622 | // Don't delete | 1623 | // Don't delete |
1623 | permissionToDelete = false; | 1624 | permissionToDelete = false; |
1624 | } | 1625 | } |