summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-06-27 18:03:47 -0700
committercallum_linden <none@none>2013-06-27 18:03:47 -0700
commitb6b4b5913827ca864dac94c72a127f520288ef8e (patch)
treedd4bc54c888b4ad2114add5d3c357fae97199c25 /indra/newview/llvovolume.cpp
parentdf0da562af801b4370b18b223c9a2d33a29ce759 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-xindra/newview/llvovolume.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 77a7d22ea3..e6385dceea 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3523,7 +3523,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];
}