diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-28 11:44:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-28 11:44:10 -0400 |
| commit | 290882cda8abfa72ee2f25288b3748d4adecc7dc (patch) | |
| tree | 94e94bce483ada5ac4f1782301fd5b5720d95e80 /indra/newview/llvovolume.cpp | |
| parent | 2ca2b28dfdca94200d93dfa47952953481d20989 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
merge changes for 3.6.1-release
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]; } |