diff options
| author | Justin Clark-Casey (justincc) | 2012-02-16 03:39:25 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-16 03:39:25 +0000 |
| commit | 96973a5778c776e95b160b6373dcb24cb0965542 (patch) | |
| tree | 073d62b3ff9422fcad86d415f1f0d8dd2a0b5aa2 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into 0.7.3-post-fixes (diff) | |
| parent | minor formatting changes from last commit (4486n7d) (diff) | |
| download | opensim-SC-96973a5778c776e95b160b6373dcb24cb0965542.zip opensim-SC-96973a5778c776e95b160b6373dcb24cb0965542.tar.gz opensim-SC-96973a5778c776e95b160b6373dcb24cb0965542.tar.bz2 opensim-SC-96973a5778c776e95b160b6373dcb24cb0965542.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5b838f8..878476e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1330,7 +1330,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1330 | m_log.DebugFormat( | 1330 | m_log.DebugFormat( |
| 1331 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", | 1331 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", |
| 1332 | RootPart.UUID); | 1332 | RootPart.UUID); |
| 1333 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel autoreturn"); | 1333 | m_scene.AddReturn(OwnerID == GroupID ? LastOwnerID : OwnerID, Name, AbsolutePosition, "parcel autoreturn"); |
| 1334 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, | 1334 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
| 1335 | DeRezAction.Return, UUID.Zero); | 1335 | DeRezAction.Return, UUID.Zero); |
| 1336 | 1336 | ||