aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-07-04 11:02:21 +0100
committerMelanie2010-07-04 11:02:21 +0100
commit8a45191aa9834623cb69f17a3855a730648e89c2 (patch)
treefcc5815839a9b67d915528f6e4510f3af2fa2faa /OpenSim/Region/Framework/Scenes
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentFixes the obvious problem in mantis #4841. Melanie needs to look at other pot... (diff)
downloadopensim-SC_OLD-8a45191aa9834623cb69f17a3855a730648e89c2.zip
opensim-SC_OLD-8a45191aa9834623cb69f17a3855a730648e89c2.tar.gz
opensim-SC_OLD-8a45191aa9834623cb69f17a3855a730648e89c2.tar.bz2
opensim-SC_OLD-8a45191aa9834623cb69f17a3855a730648e89c2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-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 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 }