diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
commit | bb87365c37047a35bf524a98d5a48cdb2d56948e (patch) | |
tree | 5b44b30944f794c2e2f78a0990cf56f81d27fa78 /indra/newview/lldrawable.cpp | |
parent | a89f3f29a0af37c7f3e78e38acb78f78e99dae78 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge viewer-release, become version 3.7.29
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rwxr-xr-x | indra/newview/lldrawable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 73930c2115..f956023358 100755 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -54,7 +54,6 @@ const F32 MIN_INTERPOLATE_DISTANCE_SQUARED = 0.001f * 0.001f; const F32 MAX_INTERPOLATE_DISTANCE_SQUARED = 10.f * 10.f; const F32 OBJECT_DAMPING_TIME_CONSTANT = 0.06f; -const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f; static LLTrace::BlockTimerStatHandle FTM_CULL_REBOUND("Cull Rebound"); @@ -874,7 +873,7 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) } pos -= camera.getOrigin(); - mDistanceWRTCamera = llround(pos.magVec(), 0.01f); + mDistanceWRTCamera = ll_round(pos.magVec(), 0.01f); mVObjp->updateLOD(); } } |