diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-19 11:31:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-19 11:31:44 -0500 |
| commit | 6c061ae4fd3c5de9a73035855180df2b26dae3dd (patch) | |
| tree | 4d46d86d34e4abd2f3f57481fda67dcec335ba66 /indra/newview/llvovolume.cpp | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
| parent | b49594662573959e0d7ccc08a2b266b3abc8130e (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 007c2b9003..3be1f52352 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3517,7 +3517,12 @@ F32 LLVOVolume::getBinRadius() } else if (mDrawable->isStatic()) { - radius = llmax((S32) mDrawable->getRadius(), 1)*size_factor; + F32 szf = size_factor; + + radius = llmax(mDrawable->getRadius(), szf); + + radius = powf(radius, 1.f+szf/radius); + radius *= 1.f + mDrawable->mDistanceWRTCamera * distance_factor[1]; radius += mDrawable->mDistanceWRTCamera * distance_factor[0]; } |