OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New config var: DisableObjectTransfer. If set to True, objects never cross; instead they stay in the region, possibly placed outside its borders.

0.8.2-post-fixes
Diva Canto 2016-07-03 12:17:19 -07:00
parent 00efc288d1
commit eb988d72bc
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -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

1
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -474,6 +474,7 @@ namespace OpenSim.Region.Framework.Scenes
!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>();

4
bin/OpenSimDefaults.ini
View File

@ -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