ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provide Telehub setting to allow use of landmarks

Browse Source 
Setting to allow use of landmarks to override telehub routing. Default is off.
This commit is contained in:
BlueWall
2012-05-18 17:47:00 -04:00
parent 0147dc6302
commit c05f87b50c
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -577,6 +577,12 @@ namespace OpenSim.Region.Framework.Scenes
{
get { return m_SpawnPointRouting; }
}
// allow landmarks to pass
private bool m_TelehubAllowLandmarks;
public bool TelehubAllowLandmarks
{
get { return m_TelehubAllowLandmarks; }
}
#endregion Properties
@@ -733,6 +739,7 @@ namespace OpenSim.Region.Framework.Scenes
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
IConfig packetConfig = m_config.Configs["PacketPool"];
if (packetConfig != null)

3
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3929,7 +3929,8 @@ namespace OpenSim.Region.Framework.Scenes
{
if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
(TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
(m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
// (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)
{