aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2010-03-18 18:57:29 +0000
committerMelanie2010-03-18 18:57:29 +0000
commit734b0416deac953937df9cd6dd1d0bbfbdc03a58 (patch)
treea2fec4f069a72c70ee790ea28e2762471c01ee41 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentInconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminati... (diff)
downloadopensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.zip
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.gz
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.bz2
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.xz
Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 41533a1..c662a6b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1518,9 +1518,10 @@ namespace OpenSim.Region.Framework.Scenes
1518 if (remoteClient != null) 1518 if (remoteClient != null)
1519 { 1519 {
1520 permissionToTake = 1520 permissionToTake =
1521 Permissions.CanReturnObject( 1521 Permissions.CanReturnObjects(
1522 grp.UUID, 1522 null,
1523 remoteClient.AgentId); 1523 remoteClient.AgentId,
1524 new List<SceneObjectGroup>() {grp});
1524 permissionToDelete = permissionToTake; 1525 permissionToDelete = permissionToTake;
1525 1526
1526 if (permissionToDelete) 1527 if (permissionToDelete)