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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.7.4.1
Justin Clark-Casey (justincc) 2012-05-18 23:56:44 +01:00
parent 896cd45939 c05f87b50c
commit fc5d274229
3 changed files with 14 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

@ -577,6 +577,12 @@ namespace OpenSim.Region.Framework.Scenes
{ {
get { return m_SpawnPointRouting; } get { return m_SpawnPointRouting; }
} }
// allow landmarks to pass
private bool m_TelehubAllowLandmarks;
public bool TelehubAllowLandmarks
{
get { return m_TelehubAllowLandmarks; }
}
#endregion Properties #endregion Properties
@ -733,6 +739,7 @@ namespace OpenSim.Region.Framework.Scenes
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
IConfig packetConfig = m_config.Configs["PacketPool"]; IConfig packetConfig = m_config.Configs["PacketPool"];
if (packetConfig != null) 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)) == if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
(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 & TeleportFlags.ViaLocation) != 0 ||
(m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)
{ {

5
bin/OpenSim.ini.example
View File

@ -249,6 +249,11 @@
;; "sequence" will place the avatar on the next sequential SpawnPoint ;; "sequence" will place the avatar on the next sequential SpawnPoint
; SpawnPointRouting = closest ; SpawnPointRouting = closest
;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true
;; default is false
; TelehubAllowLandmark = false
[Estates] [Estates]
; If these values are commented out then the user will be asked for estate details when required (this is the normal case). ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
; If these values are uncommented then they will be used to create a default estate as necessary. ; If these values are uncommented then they will be used to create a default estate as necessary.