diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
| commit | acda43ed3881eeab60ee9edfdf76ac8eebd723cc (patch) | |
| tree | f59c0d1a12f7a3b0dc14498a9a0f57e2a8f66ef5 /indra/newview/llvovolume.cpp | |
| parent | 32a953f65eae51850bad1b2c4c2a63d3dff12a68 (diff) | |
| parent | 0906d000b36d4da2116e0b9347a37598c918ce08 (diff) | |
CHOP-959: merge --graphicslevel fix up to tip
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]; } |