diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/llworld.cpp | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index f6116eb718..1d2e9af3b6 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -481,6 +481,8 @@ F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d land_intersection.mdV[VZ] = regionp->getLand().resolveHeightGlobal(point_a); normalized_land_distance = (F32)(point_a.mdV[VZ] - land_intersection.mdV[VZ]) / segment_length; + intersection = land_intersection; + intersection_normal = resolveLandNormalGlobal(land_intersection); if (avatarp && !avatarp->mFootPlane.isExactlyClear()) { @@ -491,17 +493,13 @@ F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d norm_dist_from_plane = llclamp(norm_dist_from_plane / segment_length, 0.f, 1.f); if (norm_dist_from_plane < normalized_land_distance) { + // collided with object before land normalized_land_distance = norm_dist_from_plane; intersection = point_a; intersection.mdV[VZ] -= norm_dist_from_plane * segment_length; intersection_normal = foot_plane_normal; } } - else - { - intersection = land_intersection; - intersection_normal = resolveLandNormalGlobal(land_intersection); - } return normalized_land_distance; } |