diff options
author | Justin Clark-Casey (justincc) | 2012-05-18 23:56:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-18 23:56:44 +0100 |
commit | fc5d2742298cb00bfa8187349f30bd7c25576828 (patch) | |
tree | 7caab0da08ba1667a2f6c08d7210e30708313443 | |
parent | Fix issue where a new outfit folder is not created when a new outfit is saved... (diff) | |
parent | Provide Telehub setting to allow use of landmarks (diff) | |
download | opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.zip opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.gz opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.bz2 opensim-SC-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 | ||||
-rwxr-xr-x | bin/OpenSim.ini.example | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3cce370..d09b895 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -577,6 +577,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
577 | { | 577 | { |
578 | get { return m_SpawnPointRouting; } | 578 | get { return m_SpawnPointRouting; } |
579 | } | 579 | } |
580 | // allow landmarks to pass | ||
581 | private bool m_TelehubAllowLandmarks; | ||
582 | public bool TelehubAllowLandmarks | ||
583 | { | ||
584 | get { return m_TelehubAllowLandmarks; } | ||
585 | } | ||
580 | 586 | ||
581 | #endregion Properties | 587 | #endregion Properties |
582 | 588 | ||
@@ -733,6 +739,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
733 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); | 739 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); |
734 | 740 | ||
735 | m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); | 741 | m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); |
742 | m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); | ||
736 | 743 | ||
737 | IConfig packetConfig = m_config.Configs["PacketPool"]; | 744 | IConfig packetConfig = m_config.Configs["PacketPool"]; |
738 | if (packetConfig != null) | 745 | if (packetConfig != null) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0c66e49..6022175 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3929,7 +3929,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3929 | { | 3929 | { |
3930 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == | 3930 | if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == |
3931 | (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || | 3931 | (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) || |
3932 | (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || | 3932 | // (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 || |
3933 | (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) || | ||
3933 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || | 3934 | (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || |
3934 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) | 3935 | (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) |
3935 | { | 3936 | { |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 9f418a4..aa29c07 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -249,6 +249,11 @@ | |||
249 | ;; "sequence" will place the avatar on the next sequential SpawnPoint | 249 | ;; "sequence" will place the avatar on the next sequential SpawnPoint |
250 | ; SpawnPointRouting = closest | 250 | ; SpawnPointRouting = closest |
251 | 251 | ||
252 | ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false | ||
253 | ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true | ||
254 | ;; default is false | ||
255 | ; TelehubAllowLandmark = false | ||
256 | |||
252 | [Estates] | 257 | [Estates] |
253 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). | 258 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). |
254 | ; If these values are uncommented then they will be used to create a default estate as necessary. | 259 | ; If these values are uncommented then they will be used to create a default estate as necessary. |