diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 19 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4eb5d64..2e82e1f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1458,20 +1458,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1458 | } | 1458 | } |
1459 | 1459 | ||
1460 | /// <summary> | 1460 | /// <summary> |
1461 | /// Recount SceneObjectPart in parcel aabb | ||
1462 | /// </summary> | ||
1463 | private void UpdateLand() | ||
1464 | { | ||
1465 | if (LandChannel != null) | ||
1466 | { | ||
1467 | if (LandChannel.IsLandPrimCountTainted()) | ||
1468 | { | ||
1469 | EventManager.TriggerParcelPrimCountUpdate(); | ||
1470 | } | ||
1471 | } | ||
1472 | } | ||
1473 | |||
1474 | /// <summary> | ||
1475 | /// Update the terrain if it needs to be updated. | 1461 | /// Update the terrain if it needs to be updated. |
1476 | /// </summary> | 1462 | /// </summary> |
1477 | private void UpdateTerrain() | 1463 | private void UpdateTerrain() |
@@ -1565,8 +1551,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1565 | } | 1551 | } |
1566 | 1552 | ||
1567 | /// <summary> | 1553 | /// <summary> |
1568 | /// Return object to avatar Message | 1554 | /// Tell an agent that their object has been returned. |
1569 | /// </summary> | 1555 | /// </summary> |
1556 | /// <remarks> | ||
1557 | /// The actual return is handled by the caller. | ||
1558 | /// </remarks> | ||
1570 | /// <param name="agentID">Avatar Unique Id</param> | 1559 | /// <param name="agentID">Avatar Unique Id</param> |
1571 | /// <param name="objectName">Name of object returned</param> | 1560 | /// <param name="objectName">Name of object returned</param> |
1572 | /// <param name="location">Location of object returned</param> | 1561 | /// <param name="location">Location of object returned</param> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 776b3b3..86f06ca 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1590,8 +1590,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1590 | parcel.LandData.OtherCleanTime) | 1590 | parcel.LandData.OtherCleanTime) |
1591 | { | 1591 | { |
1592 | DetachFromBackup(); | 1592 | DetachFromBackup(); |
1593 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1593 | m_log.DebugFormat( |
1594 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); | 1594 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", |
1595 | RootPart.UUID); | ||
1596 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel autoreturn"); | ||
1595 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, | 1597 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
1596 | DeRezAction.Return, UUID.Zero); | 1598 | DeRezAction.Return, UUID.Zero); |
1597 | 1599 | ||