diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 97d417f..e6041b4 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -2607,7 +2607,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2607 | return neighbourRegion; | 2607 | return neighbourRegion; |
2608 | } | 2608 | } |
2609 | 2609 | ||
2610 | 2610 | /* not in use. -> CrossPrimGroupIntoNewRegion | |
2611 | /// <summary> | 2611 | /// <summary> |
2612 | /// Move the given scene object into a new region depending on which region its absolute position has moved | 2612 | /// Move the given scene object into a new region depending on which region its absolute position has moved |
2613 | /// into. | 2613 | /// into. |
@@ -2672,7 +2672,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2672 | grp.ScheduleGroupForFullUpdate(); | 2672 | grp.ScheduleGroupForFullUpdate(); |
2673 | } | 2673 | } |
2674 | } | 2674 | } |
2675 | 2675 | */ | |
2676 | /// <summary> | 2676 | /// <summary> |
2677 | /// Move the given scene object into a new region | 2677 | /// Move the given scene object into a new region |
2678 | /// </summary> | 2678 | /// </summary> |
@@ -2682,7 +2682,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2682 | /// true if the crossing itself was successful, false on failure | 2682 | /// true if the crossing itself was successful, false on failure |
2683 | /// FIMXE: we still return true if the crossing object was not successfully deleted from the originating region | 2683 | /// FIMXE: we still return true if the crossing object was not successfully deleted from the originating region |
2684 | /// </returns> | 2684 | /// </returns> |
2685 | public bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent) | 2685 | public bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent, bool removeScripts) |
2686 | { | 2686 | { |
2687 | //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<"); | 2687 | //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<"); |
2688 | 2688 | ||
@@ -2714,7 +2714,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2714 | // We remove the object here | 2714 | // We remove the object here |
2715 | try | 2715 | try |
2716 | { | 2716 | { |
2717 | grp.Scene.DeleteSceneObject(grp, silent); | 2717 | grp.Scene.DeleteSceneObject(grp, silent, removeScripts); |
2718 | } | 2718 | } |
2719 | catch (Exception e) | 2719 | catch (Exception e) |
2720 | { | 2720 | { |
@@ -2764,7 +2764,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2764 | "[ENTITY TRANSFER MODULE]: Sending attachment {0} to region {1}", | 2764 | "[ENTITY TRANSFER MODULE]: Sending attachment {0} to region {1}", |
2765 | clone.UUID, destination.RegionName); | 2765 | clone.UUID, destination.RegionName); |
2766 | 2766 | ||
2767 | CrossPrimGroupIntoNewRegion(destination, Vector3.Zero, clone, silent); | 2767 | CrossPrimGroupIntoNewRegion(destination, Vector3.Zero, clone, silent,true); |
2768 | } | 2768 | } |
2769 | } | 2769 | } |
2770 | 2770 | ||