New config var: DisableObjectTransfer. If set to True, objects never cross; instead they stay in the region, possibly placed outside its borders.
parent
00efc288d1
commit
eb988d72bc
|
@ -232,6 +232,12 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool AllowAvatarCrossing { get; set; }
|
public bool AllowAvatarCrossing { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// When placed outside the region's border, do we transfer the objects or
|
||||||
|
/// do we keep simulating them here?
|
||||||
|
/// </summary>
|
||||||
|
public bool DisableObjectTransfer { get; set; }
|
||||||
|
|
||||||
public bool m_useFlySlow;
|
public bool m_useFlySlow;
|
||||||
public bool m_useTrashOnDelete = true;
|
public bool m_useTrashOnDelete = true;
|
||||||
|
|
||||||
|
@ -1131,6 +1137,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (entityTransferConfig != null)
|
if (entityTransferConfig != null)
|
||||||
{
|
{
|
||||||
AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
|
AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
|
||||||
|
DisableObjectTransfer = entityTransferConfig.GetBoolean("DisableObjectTransfer", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Interest Management
|
#region Interest Management
|
||||||
|
|
|
@ -473,7 +473,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (
|
if (
|
||||||
!Scene.PositionIsInCurrentRegion(val)
|
!Scene.PositionIsInCurrentRegion(val)
|
||||||
&& !IsAttachmentCheckFull()
|
&& !IsAttachmentCheckFull()
|
||||||
&& (!Scene.LoadingPrims)
|
&& (!Scene.LoadingPrims)
|
||||||
|
&& !Scene.DisableObjectTransfer
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
|
IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
|
||||||
|
|
|
@ -775,6 +775,10 @@
|
||||||
; Allow avatars to cross into and out of the region.
|
; Allow avatars to cross into and out of the region.
|
||||||
AllowAvatarCrossing = true
|
AllowAvatarCrossing = true
|
||||||
|
|
||||||
|
; This disables border transfers for objects. When true, objects can be placed outside
|
||||||
|
; the region's border without being transferred to another simulator.
|
||||||
|
DisableObjectTransfer = false
|
||||||
|
|
||||||
; Minimum user level required for HyperGrid teleports
|
; Minimum user level required for HyperGrid teleports
|
||||||
LevelHGTeleport = 0
|
LevelHGTeleport = 0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue