aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authoronefang2020-09-09 22:59:24 +1000
committeronefang2020-09-09 22:59:24 +1000
commitaaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc (patch)
tree0cca9608b28ec503f045a26b0f664a176a061d1f /OpenSim/Region/CoreModules/Framework/EntityTransfer
parentUse F1 instead of ? as the in command help key. (diff)
downloadopensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.zip
opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.gz
opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.bz2
opensim-SC-aaef497afbedef9382c9afdcb9f8d0d5b0a0e0bc.tar.xz
Various teleport fixes.
TPs from scripts avoid all that silly raycasting nonsense, just go where we ask. For the "teleport from above" case, do the right thing. Which includes looking for designated floor prims, which have ^ as the first character of their description. Don't do "teleport from above" when we have proper coords. Teleport home from off grid shouldn't land on roofs either.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index fa49546..9970132 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -673,9 +673,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
673 673
674 string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId); 674 string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId);
675 675
676 m_log.DebugFormat( 676//// m_log.DebugFormat(
677 "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2} to {3} ({4}) {5}/{6}", 677 m_log.InfoFormat(
678 sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, 678 "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2}/{3} to {4} ({5}) {6}/{7}",
679 sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, sp.AbsolutePosition,
679 reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); 680 reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
680 681
681 RegionInfo sourceRegion = sp.Scene.RegionInfo; 682 RegionInfo sourceRegion = sp.Scene.RegionInfo;