summaryrefslogtreecommitdiff
path: root/indra/newview/llphysicsmotion.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-18 07:33:08 -0400
committerOz Linden <oz@lindenlab.com>2011-05-18 07:33:08 -0400
commit5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch)
treecd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /indra/newview/llphysicsmotion.cpp
parent66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff)
parent644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff)
merge up latest viewer-development (post mesh)
Diffstat (limited to 'indra/newview/llphysicsmotion.cpp')
-rw-r--r--indra/newview/llphysicsmotion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 30a04109bc..e124916c48 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -652,7 +652,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
const F32 area_for_max_settings = 0.0;
const F32 area_for_min_settings = 1400.0;
const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);
- const F32 pixel_area = fsqrtf(mCharacter->getPixelArea());
+ const F32 pixel_area = sqrtf(mCharacter->getPixelArea());
const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);
if ((pixel_area > area_for_this_setting) || is_self)