diff options
| author | Justin Clark-Casey (justincc) | 2014-04-29 20:15:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-04-29 20:15:29 +0100 |
| commit | 5fc61942e07f768f65ce5317cc5b9454d2888c56 (patch) | |
| tree | 0899648bc053f1e8723bc46cae8383ab0ae73371 /OpenSim/Region/Framework/Scenes | |
| parent | Restore terrain height and flying adjustments that were eliminated from non-m... (diff) | |
| download | opensim-SC-5fc61942e07f768f65ce5317cc5b9454d2888c56.zip opensim-SC-5fc61942e07f768f65ce5317cc5b9454d2888c56.tar.gz opensim-SC-5fc61942e07f768f65ce5317cc5b9454d2888c56.tar.bz2 opensim-SC-5fc61942e07f768f65ce5317cc5b9454d2888c56.tar.xz | |
minor: convert back some tabs to spaces that got into ScenePresence via recent patch bc969a6b
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 73fe1b7..8c56975 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2498,10 +2498,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2498 | if (pos.Z - terrainHeight < 0.2) | 2498 | if (pos.Z - terrainHeight < 0.2) |
| 2499 | pos.Z = terrainHeight; | 2499 | pos.Z = terrainHeight; |
| 2500 | 2500 | ||
| 2501 | if (noFly) | 2501 | if (noFly) |
| 2502 | Flying = false; | 2502 | Flying = false; |
| 2503 | else if (pos.Z > terrainHeight) | 2503 | else if (pos.Z > terrainHeight) |
| 2504 | Flying = true; | 2504 | Flying = true; |
| 2505 | 2505 | ||
| 2506 | // m_log.DebugFormat( | 2506 | // m_log.DebugFormat( |
| 2507 | // "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", | 2507 | // "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", |