diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
| commit | cf33a9a7b31b19d0f87e11997aaba938a8ee950d (patch) | |
| tree | f64996ebb904ec562447be92b2e5273b9261d41c /indra/newview/llvovolume.cpp | |
| parent | 1108cd0e5c052176f9dacc69b04d702a06b744de (diff) | |
| parent | e12b6caaa0596eae2fad43636663dd4e14a1949c (diff) | |
merge changes for storm-1951
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]; } |