diff options
| author | Melanie | 2012-02-18 22:21:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-18 22:21:10 +0000 |
| commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
| tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
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 a4ca0fb..0d14b83 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1754,7 +1754,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1754 | m_log.DebugFormat( | 1754 | m_log.DebugFormat( |
| 1755 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", | 1755 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", |
| 1756 | RootPart.UUID); | 1756 | RootPart.UUID); |
| 1757 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel autoreturn"); | 1757 | m_scene.AddReturn(OwnerID == GroupID ? LastOwnerID : OwnerID, Name, AbsolutePosition, "parcel autoreturn"); |
| 1758 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, | 1758 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
| 1759 | DeRezAction.Return, UUID.Zero); | 1759 | DeRezAction.Return, UUID.Zero); |
| 1760 | 1760 | ||