aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-19 02:46:37 +0100
committerJustin Clark-Casey (justincc)2012-05-19 02:46:37 +0100
commit33247c8d85162209e97f118d4f3f3b184bacd991 (patch)
treeb25e2f0e83aca866475874bf30ef270a0c2bcb5a /OpenSim/Region/Framework
parentAdd is_megaregion flag into oar control file. Not currently read - for futur... (diff)
parentFurther refinement on properties (diff)
downloadopensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.zip
opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.gz
opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.bz2
opensim-SC_OLD-33247c8d85162209e97f118d4f3f3b184bacd991.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d09b895..5a0f564 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -569,19 +569,18 @@ namespace OpenSim.Region.Framework.Scenes
569 get { return m_sceneGraph.Entities; } 569 get { return m_sceneGraph.Entities; }
570 } 570 }
571 571
572 // can be closest/random/sequence 572
573 private string m_SpawnPointRouting = "closest";
574 // used in sequence see: SpawnPoint() 573 // used in sequence see: SpawnPoint()
575 private int m_SpawnPoint; 574 private int m_SpawnPoint;
575 // can be closest/random/sequence
576 public string SpawnPointRouting 576 public string SpawnPointRouting
577 { 577 {
578 get { return m_SpawnPointRouting; } 578 get; private set;
579 } 579 }
580 // allow landmarks to pass 580 // allow landmarks to pass
581 private bool m_TelehubAllowLandmarks;
582 public bool TelehubAllowLandmarks 581 public bool TelehubAllowLandmarks
583 { 582 {
584 get { return m_TelehubAllowLandmarks; } 583 get; private set;
585 } 584 }
586 585
587 #endregion Properties 586 #endregion Properties
@@ -738,8 +737,8 @@ namespace OpenSim.Region.Framework.Scenes
738 737
739 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 738 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
740 739
741 m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); 740 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
742 m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); 741 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
743 742
744 IConfig packetConfig = m_config.Configs["PacketPool"]; 743 IConfig packetConfig = m_config.Configs["PacketPool"];
745 if (packetConfig != null) 744 if (packetConfig != null)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6022175..3adafc1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3929,7 +3929,6 @@ 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 ||
3933 (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) || 3932 (m_scene.TelehubAllowLandmarks == true ? false : ((m_teleportFlags & TeleportFlags.ViaLandmark) != 0 )) ||
3934 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || 3933 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3935 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0) 3934 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)