diff options
| author | Melanie Thielker | 2010-06-01 03:04:49 +0200 |
|---|---|---|
| committer | Melanie | 2010-06-01 02:10:53 +0100 |
| commit | a5728cc91c6737e6abef75c4b1da2f78a8317d84 (patch) | |
| tree | 22b3d1bf49305742c702727a875f4303cf2906f8 /OpenSim/Region/Framework/Scenes | |
| parent | Continuing refactor. Refactor DeRezObject to deal with multiple objects (diff) | |
| download | opensim-SC-a5728cc91c6737e6abef75c4b1da2f78a8317d84.zip opensim-SC-a5728cc91c6737e6abef75c4b1da2f78a8317d84.tar.gz opensim-SC-a5728cc91c6737e6abef75c4b1da2f78a8317d84.tar.bz2 opensim-SC-a5728cc91c6737e6abef75c4b1da2f78a8317d84.tar.xz | |
Fix prim returns I broke earlier
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index bad92a0..cc7b648 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1618,11 +1618,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1618 | null, | 1618 | null, |
| 1619 | remoteClient.AgentId, | 1619 | remoteClient.AgentId, |
| 1620 | deleteGroups)) | 1620 | deleteGroups)) |
| 1621 | foreach (SceneObjectGroup g in deleteGroups) | ||
| 1622 | { | 1621 | { |
| 1623 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | 1622 | permissionToTake = true; |
| 1624 | DeleteSceneObject(g, false); | 1623 | permissionToDelete = true; |
| 1625 | return; | 1624 | |
| 1625 | foreach (SceneObjectGroup g in deleteGroups) | ||
| 1626 | { | ||
| 1627 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | ||
| 1628 | } | ||
| 1626 | } | 1629 | } |
| 1627 | } | 1630 | } |
| 1628 | else // Auto return passes through here with null agent | 1631 | else // Auto return passes through here with null agent |