diff options
| author | Melanie Thielker | 2010-06-01 03:04:49 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-06-01 03:17:21 +0200 |
| commit | 16d8602d3cad613a830a4903bb0d2beb1fa6b7e2 (patch) | |
| tree | 641a2ac6eab90f6f98c9253184fca9131ebaa780 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Change the handling of CreateSelected. Only send it on real creation, not (diff) | |
| download | opensim-SC_OLD-16d8602d3cad613a830a4903bb0d2beb1fa6b7e2.zip opensim-SC_OLD-16d8602d3cad613a830a4903bb0d2beb1fa6b7e2.tar.gz opensim-SC_OLD-16d8602d3cad613a830a4903bb0d2beb1fa6b7e2.tar.bz2 opensim-SC_OLD-16d8602d3cad613a830a4903bb0d2beb1fa6b7e2.tar.xz | |
Fix prim returns I broke earlier
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -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 e1128a6..e111867 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1637,11 +1637,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1637 | null, | 1637 | null, |
| 1638 | remoteClient.AgentId, | 1638 | remoteClient.AgentId, |
| 1639 | deleteGroups)) | 1639 | deleteGroups)) |
| 1640 | foreach (SceneObjectGroup g in deleteGroups) | ||
| 1641 | { | 1640 | { |
| 1642 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | 1641 | permissionToTake = true; |
| 1643 | DeleteSceneObject(g, false); | 1642 | permissionToDelete = true; |
| 1644 | return; | 1643 | |
| 1644 | foreach (SceneObjectGroup g in deleteGroups) | ||
| 1645 | { | ||
| 1646 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | ||
| 1647 | } | ||
| 1645 | } | 1648 | } |
| 1646 | } | 1649 | } |
| 1647 | else // Auto return passes through here with null agent | 1650 | else // Auto return passes through here with null agent |