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 /OpenSim/Region/Framework/Scenes/Scene.cs | |
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_OLD-fc5d2742298cb00bfa8187349f30bd7c25576828.zip opensim-SC_OLD-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.gz opensim-SC_OLD-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.bz2 opensim-SC_OLD-fc5d2742298cb00bfa8187349f30bd7c25576828.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 7 insertions, 0 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) |