diff options
author | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
commit | 4adada6fe48a960850639628c0f90e55c848235f (patch) | |
tree | 63f616d32f35012fe278a8cdeb9b3e762ecde37a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.zip opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.gz opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2 opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5513584..5f00f84 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1304,8 +1304,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1304 | DetachFromBackup(); | 1304 | DetachFromBackup(); |
1305 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1305 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); |
1306 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); | 1306 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); |
1307 | m_scene.DeRezObject(null, RootPart.LocalId, | 1307 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
1308 | RootPart.GroupID, DeRezAction.Return, UUID.Zero); | 1308 | DeRezAction.Return, UUID.Zero); |
1309 | 1309 | ||
1310 | return; | 1310 | return; |
1311 | } | 1311 | } |