diff options
| author | Justin Clark-Casey (justincc) | 2012-04-25 01:51:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-25 01:51:40 +0100 |
| commit | a65ca24701ac34415bf76f4d9094ab42ae721c9a (patch) | |
| tree | d31e0c5934d58716b3d97440c8870c2c21eba569 /OpenSim/Region/CoreModules/Framework | |
| parent | Comment out AvatarService.SetAvatar debug log line for now (diff) | |
| download | opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.zip opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.gz opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.bz2 opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.xz | |
Add regression test TestSameRegionTeleport()
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -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 feb783f..221e0bd 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 192 | m_log.WarnFormat( | 192 | m_log.WarnFormat( |
| 193 | "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", | 193 | "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", |
| 194 | position, sp.Name, sp.UUID, emergencyPos); | 194 | position, sp.Name, sp.UUID, emergencyPos); |
| 195 | 195 | ||
| 196 | position = emergencyPos; | 196 | position = emergencyPos; |
| 197 | } | 197 | } |
| 198 | 198 | ||