Merge branch 'master' into ghosts

ghosts
Justin Clark-Casey (justincc) 2014-09-03 00:26:53 +01:00
commit a129e9e351
3 changed files with 22 additions and 1 deletions

View File

@ -224,6 +224,12 @@ namespace OpenSim.Region.Framework.Scenes
public bool m_clampPrimSize;
public bool m_trustBinaries;
public bool m_allowScriptCrossings = true;
/// <summary>
/// Can avatars cross from and to this region?
/// </summary>
public bool AllowAvatarCrossing { get; set; }
public bool m_useFlySlow;
public bool m_useTrashOnDelete = true;
@ -1023,6 +1029,12 @@ namespace OpenSim.Region.Framework.Scenes
#endregion Region Config
IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
if (entityTransferConfig != null)
{
AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
}
#region Interest Management
IConfig interestConfig = m_config.Configs["InterestManagement"];
@ -1091,6 +1103,8 @@ namespace OpenSim.Region.Framework.Scenes
CollidablePrims = true;
PhysicsEnabled = true;
AllowAvatarCrossing = true;
PeriodicBackup = true;
UseBackup = true;
@ -5613,6 +5627,9 @@ namespace OpenSim.Region.Framework.Scenes
return true;
}
if (!AllowAvatarCrossing && !viaTeleport)
return false;
// FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check.
// However, the long term fix is to make sure root agent count is always accurate.
m_sceneGraph.RecalculateStats();

View File

@ -3226,6 +3226,7 @@ namespace OpenSim.Region.Framework.Scenes
m_lastVelocity = Velocity;
}
if (Scene.AllowAvatarCrossing)
CheckForBorderCrossing();
CheckForSignificantMovement(); // sends update to the modules.

View File

@ -711,6 +711,9 @@
;
max_distance = 65535
; Allow avatars to cross into and out of the region.
AllowAvatarCrossing = true
; Minimum user level required for HyperGrid teleports
LevelHGTeleport = 0