aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-07-04 02:59:38 -0700
committerDiva Canto2010-07-04 02:59:38 -0700
commitabe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c (patch)
tree96a1b9d23f84bb2de1a3ec2f27d044c938b14d28
parentCompiled Robust.32BitLaunch.exe to .Net 3.5 (diff)
downloadopensim-SC_OLD-abe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c.zip
opensim-SC_OLD-abe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c.tar.gz
opensim-SC_OLD-abe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c.tar.bz2
opensim-SC_OLD-abe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c.tar.xz
Fixes the obvious problem in mantis #4841. Melanie needs to look at other potential problems there, though.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
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 33173dd..bcb5f7c 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 }