diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-02 18:01:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-02 18:01:27 -0500 |
| commit | a4e49310a57cab3d5041ec733d80ce50dadf4c64 (patch) | |
| tree | a82b60f752e491ca936664ac9bf73ddae9a5dbf6 | |
| parent | c0e6d606e617e7f92fc492ffbad03f5fadb8d3a3 (diff) | |
STORM-1210 fsqrtf cleanup
| -rw-r--r-- | indra/newview/llmanipscale.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index 78d1e717f2..738d82e732 100644 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -259,7 +259,7 @@ void LLManipScale::render() // range != zero F32 fraction_of_fov = BOX_HANDLE_BASE_SIZE / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels(); F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView(); // radians - mBoxHandleSize = fsqrtf(range_squared) * tan(apparent_angle) * BOX_HANDLE_BASE_FACTOR; + mBoxHandleSize = (F32) sqrtf(range_squared) * tan(apparent_angle) * BOX_HANDLE_BASE_FACTOR; } else { diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index f76cbcb465..9b264b81c7 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -6983,7 +6983,7 @@ bool LLSelectMgr::selectionMove(const LLVector3& displ, // factor the distance into the displacement vector. This will get us // equally visible movements for both close and far away selections. - F32 min_dist = sqrt(fsqrtf(min_dist_squared)) / 2; + F32 min_dist = sqrt((F32) sqrtf(min_dist_squared)) / 2; displ_global.setVec(displ.mV[0] * min_dist, displ.mV[1] * min_dist, displ.mV[2] * min_dist); |