diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-07-01 09:29:31 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-07-01 09:29:31 -0700 |
| commit | 67dc7e1abeda77bdacb472408a524e1e2f9b53c5 (patch) | |
| tree | 62db12c228f457319e8a082cadaf25495921f3a1 /indra/newview/llvovolume.cpp | |
| parent | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merge with 3.6.1
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]; } |