diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index caeb4f8..92ea62c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -529,14 +529,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
529 | 529 | ||
530 | if (reg != null) | 530 | if (reg != null) |
531 | { | 531 | { |
532 | finalDestination = GetFinalDestination(reg); | 532 | string message; |
533 | finalDestination = GetFinalDestination(reg, out message); | ||
533 | 534 | ||
534 | if (finalDestination == null) | 535 | if (finalDestination == null) |
535 | { | 536 | { |
536 | m_log.WarnFormat( "{0} Final destination is having problems. Unable to teleport {1} {2}", | 537 | m_log.WarnFormat( "{0} Final destination is having problems. Unable to teleport {1} {2}: {3}", |
537 | LogHeader, sp.Name, sp.UUID); | 538 | LogHeader, sp.Name, sp.UUID, message); |
538 | 539 | ||
539 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); | 540 | sp.ControllingClient.SendTeleportFailed(message); |
540 | return; | 541 | return; |
541 | } | 542 | } |
542 | 543 | ||
@@ -557,6 +558,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
557 | return; | 558 | return; |
558 | } | 559 | } |
559 | 560 | ||
561 | if (message != null) | ||
562 | sp.ControllingClient.SendAgentAlertMessage(message, true); | ||
563 | |||
560 | // | 564 | // |
561 | // This is it | 565 | // This is it |
562 | // | 566 | // |
@@ -1327,8 +1331,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1327 | scene.SendKillObject(new List<uint> { localID }); | 1331 | scene.SendKillObject(new List<uint> { localID }); |
1328 | } | 1332 | } |
1329 | 1333 | ||
1330 | protected virtual GridRegion GetFinalDestination(GridRegion region) | 1334 | protected virtual GridRegion GetFinalDestination(GridRegion region, out string message) |
1331 | { | 1335 | { |
1336 | message = null; | ||
1332 | return region; | 1337 | return region; |
1333 | } | 1338 | } |
1334 | 1339 | ||