diff options
| author | Melanie | 2012-04-25 02:33:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 02:33:39 +0100 |
| commit | 9a235018247cb8dfe07043c354b31da155d19e1f (patch) | |
| tree | db8c223bc505a0bf9437d3550f4a101d24874545 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff) | |
| download | opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.zip opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2 opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 690edce..e640733 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 | ||