diff options
| author | Melanie Thielker | 2008-11-21 07:33:13 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-21 07:33:13 +0000 |
| commit | ee4d4d784eb9b51b29fe4bda3fc9ec3594d24f5a (patch) | |
| tree | 9ce899e33c2550d61048ca0690ba5e103aa8abd6 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
| parent | Allow selecting group objects and selecting objects by owner from the (diff) | |
| download | opensim-SC_OLD-ee4d4d784eb9b51b29fe4bda3fc9ec3594d24f5a.zip opensim-SC_OLD-ee4d4d784eb9b51b29fe4bda3fc9ec3594d24f5a.tar.gz opensim-SC_OLD-ee4d4d784eb9b51b29fe4bda3fc9ec3594d24f5a.tar.bz2 opensim-SC_OLD-ee4d4d784eb9b51b29fe4bda3fc9ec3594d24f5a.tar.xz | |
Fully implement object return from the parcel dialog
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 82ab4eb..e8eaef8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -1224,7 +1224,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1224 | parcel.landData.OtherCleanTime) | 1224 | parcel.landData.OtherCleanTime) |
| 1225 | { | 1225 | { |
| 1226 | m_log.InfoFormat("[SCENE] Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1226 | m_log.InfoFormat("[SCENE] Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); |
| 1227 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition); | 1227 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); |
| 1228 | m_scene.DeRezObject(null, RootPart.LocalId, | 1228 | m_scene.DeRezObject(null, RootPart.LocalId, |
| 1229 | RootPart.GroupID, 9, UUID.Zero); | 1229 | RootPart.GroupID, 9, UUID.Zero); |
| 1230 | 1230 | ||