diff options
author | AliciaRaven | 2016-11-22 15:31:45 +0000 |
---|---|---|
committer | AliciaRaven | 2016-11-22 15:31:45 +0000 |
commit | 94e48838d5b1f0bf0c5b0e40b7bc9a6f1be156e9 (patch) | |
tree | 384a7f929cbc59bf4b45d9daaae976471427219a /OpenSim/Region | |
parent | Coding standards: A local variable may not use the prefix m_ (diff) | |
download | opensim-SC_OLD-94e48838d5b1f0bf0c5b0e40b7bc9a6f1be156e9.zip opensim-SC_OLD-94e48838d5b1f0bf0c5b0e40b7bc9a6f1be156e9.tar.gz opensim-SC_OLD-94e48838d5b1f0bf0c5b0e40b7bc9a6f1be156e9.tar.bz2 opensim-SC_OLD-94e48838d5b1f0bf0c5b0e40b7bc9a6f1be156e9.tar.xz |
Include new Region.ini option for DefaultLandingPoint for teleports with no coords specified.
This is useful when using a Telehub would be to restrictive as it would block landmarks and map teleports. This location is only ever used when no coordinates are provided. If config value not set, the previous default of 128,128 is used.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 1161571..23cfde5 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -455,6 +455,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
455 | position = emergencyPos; | 455 | position = emergencyPos; |
456 | } | 456 | } |
457 | 457 | ||
458 | // Check Default Location (Also See ScenePresence.CompleteMovement) | ||
459 | if (position.X == 128f && position.Y == 128f) | ||
460 | position = sp.Scene.RegionInfo.DefaultLandingPoint; | ||
461 | |||
458 | // TODO: Get proper AVG Height | 462 | // TODO: Get proper AVG Height |
459 | float localHalfAVHeight = 0.8f; | 463 | float localHalfAVHeight = 0.8f; |
460 | if (sp.Appearance != null) | 464 | if (sp.Appearance != null) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7efd920..2cf0e9d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2043,6 +2043,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2043 | look = new Vector3(0.99f, 0.042f, 0); | 2043 | look = new Vector3(0.99f, 0.042f, 0); |
2044 | } | 2044 | } |
2045 | 2045 | ||
2046 | // Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion) | ||
2047 | if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f) | ||
2048 | AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint; | ||
2049 | |||
2046 | if (!MakeRootAgent(AbsolutePosition, flying, ref look)) | 2050 | if (!MakeRootAgent(AbsolutePosition, flying, ref look)) |
2047 | { | 2051 | { |
2048 | m_log.DebugFormat( | 2052 | m_log.DebugFormat( |