Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
33247c8d85
|
@ -569,19 +569,18 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
get { return m_sceneGraph.Entities; }
|
||||
}
|
||||
|
||||
// can be closest/random/sequence
|
||||
private string m_SpawnPointRouting = "closest";
|
||||
|
||||
// used in sequence see: SpawnPoint()
|
||||
private int m_SpawnPoint;
|
||||
// can be closest/random/sequence
|
||||
public string SpawnPointRouting
|
||||
{
|
||||
get { return m_SpawnPointRouting; }
|
||||
get; private set;
|
||||
}
|
||||
// allow landmarks to pass
|
||||
private bool m_TelehubAllowLandmarks;
|
||||
public bool TelehubAllowLandmarks
|
||||
{
|
||||
get { return m_TelehubAllowLandmarks; }
|
||||
get; private set;
|
||||
}
|
||||
|
||||
#endregion Properties
|
||||
|
@ -738,8 +737,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
|
||||
|
||||
m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
|
||||
m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
|
||||
SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
|
||||
TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
|
||||
|
||||
IConfig packetConfig = m_config.Configs["PacketPool"];
|
||||
if (packetConfig != null)
|
||||
|
|
|
@ -3929,7 +3929,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
|
||||
(TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
|
||||
// (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
|
||||
(m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) ||
|
||||
(m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
|
||||
(m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)
|
||||
|
|
Loading…
Reference in New Issue