diff options
author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/llmaniptranslate.cpp | |
parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
-rwxr-xr-x | indra/newview/llmaniptranslate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index ff0d25d203..8a89131c43 100755 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1246,7 +1246,7 @@ void LLManipTranslate::renderSnapGuides() // find distance to nearest smallest grid unit F32 offset_nearest_grid_unit = fmodf(dist_grid_axis, smallest_grid_unit_scale); // how many smallest grid units are we away from largest grid scale? - S32 sub_div_offset = llround(fmod(dist_grid_axis - offset_nearest_grid_unit, getMinGridScale() / sGridMinSubdivisionLevel) / smallest_grid_unit_scale); + S32 sub_div_offset = llround(fmodf(dist_grid_axis - offset_nearest_grid_unit, getMinGridScale() / sGridMinSubdivisionLevel) / smallest_grid_unit_scale); S32 num_ticks_per_side = llmax(1, llfloor(0.5f * guide_size_meters / smallest_grid_unit_scale)); LLGLDepthTest gls_depth(GL_FALSE); |