diff options
| author | Melanie | 2012-06-06 20:35:37 +0200 |
|---|---|---|
| committer | Melanie | 2012-06-06 20:35:37 +0200 |
| commit | e09a74493f374b2fc837596f496b4338c49e074f (patch) | |
| tree | 374515a2c43b3f670c0f55d44d95a2f7ddd4b127 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Fix not sending TransferInfo when an asset is not found. This clogs (diff) | |
| download | opensim-SC-e09a74493f374b2fc837596f496b4338c49e074f.zip opensim-SC-e09a74493f374b2fc837596f496b4338c49e074f.tar.gz opensim-SC-e09a74493f374b2fc837596f496b4338c49e074f.tar.bz2 opensim-SC-e09a74493f374b2fc837596f496b4338c49e074f.tar.xz | |
Reverse the logic of a conditional. Clears up a merge artefact.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 7db2491..b9897c4 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 430 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, | 430 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, |
| 431 | // it's actually doing a lot of work. | 431 | // it's actually doing a lot of work. |
| 432 | IPEndPoint endPoint = finalDestination.ExternalEndPoint; | 432 | IPEndPoint endPoint = finalDestination.ExternalEndPoint; |
| 433 | if (endPoint != null && endPoint.Address != null) | 433 | if (endPoint == null || endPoint.Address == null) |
| 434 | { | 434 | { |
| 435 | sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down"); | 435 | sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down"); |
| 436 | m_entityTransferStateMachine.ResetFromTransit(sp.UUID); | 436 | m_entityTransferStateMachine.ResetFromTransit(sp.UUID); |