diff options
| author | onefang | 2019-07-24 05:49:26 +1000 |
|---|---|---|
| committer | onefang | 2019-07-24 05:49:26 +1000 |
| commit | 15b2a91ffc6d240277a852aa750a0259ae6a2a17 (patch) | |
| tree | fb08c599396ba11d5f23b7bca2af21b9cb5af368 /OpenSim/Region/CoreModules/Framework | |
| parent | Revert list content type check. (diff) | |
| download | opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.zip opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.gz opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.bz2 opensim-SC_OLD-15b2a91ffc6d240277a852aa750a0259ae6a2a17.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 |
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 9ce6201..59e71c6 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -679,9 +679,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 679 | 679 | ||
| 680 | string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId); | 680 | string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId); |
| 681 | 681 | ||
| 682 | m_log.DebugFormat( | 682 | //// m_log.DebugFormat( |
| 683 | "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2} to {3} ({4}) {5}/{6}", | 683 | m_log.InfoFormat( |
| 684 | sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, | 684 | "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2}/{3} to {4} ({5}) {6}/{7}", |
| 685 | sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, sp.AbsolutePosition, | ||
| 685 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); | 686 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); |
| 686 | 687 | ||
| 687 | RegionInfo sourceRegion = sp.Scene.RegionInfo; | 688 | RegionInfo sourceRegion = sp.Scene.RegionInfo; |