diff options
| author | Dan Lake | 2011-09-21 16:24:48 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-09-21 16:24:48 -0700 |
| commit | 28a482a7ee2cebab1aa720477af175d7e26d702e (patch) | |
| tree | 863fb4b43a571da4d1d963b5a1383538e6391ec8 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Commented out new debug statements in ScenePresence (diff) | |
| parent | Reinstate option to land an npc when it reaches a target. (diff) | |
| download | opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.zip opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.gz opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.bz2 opensim-SC_OLD-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 000a6ed..eadec09 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -5178,10 +5178,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5178 | for (int i = 0; i < 5; i++) | 5178 | for (int i = 0; i < 5; i++) |
| 5179 | presence.PhysicsActor.IsColliding = true; | 5179 | presence.PhysicsActor.IsColliding = true; |
| 5180 | 5180 | ||
| 5181 | // Vector3 targetPos = presence.MoveToPositionTarget; | 5181 | if (presence.LandAtTarget) |
| 5182 | // if (m_avatars[presence.UUID].LandAtTarget) | 5182 | presence.PhysicsActor.Flying = false; |
| 5183 | // presence.PhysicsActor.Flying = false; | ||
| 5184 | 5183 | ||
| 5184 | // Vector3 targetPos = presence.MoveToPositionTarget; | ||
| 5185 | // float terrainHeight = (float)presence.Scene.Heightmap[(int)targetPos.X, (int)targetPos.Y]; | 5185 | // float terrainHeight = (float)presence.Scene.Heightmap[(int)targetPos.X, (int)targetPos.Y]; |
| 5186 | // if (targetPos.Z - terrainHeight < 0.2) | 5186 | // if (targetPos.Z - terrainHeight < 0.2) |
| 5187 | // { | 5187 | // { |