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-19 02:46:37 +01:00
parent 2b60a5c5d6 247a56593f
commit 33247c8d85
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,19 +569,18 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_sceneGraph.Entities; } get { return m_sceneGraph.Entities; }
} }
// can be closest/random/sequence
private string m_SpawnPointRouting = "closest";
// used in sequence see: SpawnPoint() // used in sequence see: SpawnPoint()
private int m_SpawnPoint; private int m_SpawnPoint;
// can be closest/random/sequence
public string SpawnPointRouting public string SpawnPointRouting
{ {
get { return m_SpawnPointRouting; } get; private set;
} }
// allow landmarks to pass // allow landmarks to pass
private bool m_TelehubAllowLandmarks;
public bool TelehubAllowLandmarks public bool TelehubAllowLandmarks
{ {
get { return m_TelehubAllowLandmarks; } get; private set;
} }
#endregion Properties #endregion Properties
@ -738,8 +737,8 @@ namespace OpenSim.Region.Framework.Scenes
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
m_TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
IConfig packetConfig = m_config.Configs["PacketPool"]; IConfig packetConfig = m_config.Configs["PacketPool"];
if (packetConfig != null) if (packetConfig != null)

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

@ -3929,7 +3929,6 @@ 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_scene.TelehubAllowLandmarks == true ? false : ((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)