diff options
author | Dave Parks <davep@lindenlab.com> | 2012-10-23 14:31:34 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-10-23 14:31:34 -0500 |
commit | 8039c4583e68b7090fffea28b388fffd61d4b443 (patch) | |
tree | 491f3a1cdbab4cfe68c69eca295f2e5747a62c40 /indra/newview/llfloatermodelpreview.cpp | |
parent | 16c6b56ee46bb84a6ec6dd0ed188697503e7a1c4 (diff) |
MAINT-1567 cleanup some gcc warnings
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 6d0d9f67d5..ea839e6f5a 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3942,7 +3942,7 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim { limit = mFMP->childGetValue("lod_triangle_limit_" + lod_name[which_lod]).asInteger(); //convert from "scene wide" to "non-instanced" triangle limit - limit *= triangle_ratio; + limit = (S32) ( (F32) limit*triangle_ratio ); } } else @@ -4048,7 +4048,7 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim U32 actual_verts = 0; U32 submeshes = 0; - mRequestedTriangleCount[lod] = triangle_count/triangle_ratio; + mRequestedTriangleCount[lod] = (S32) ( (F32) triangle_count / triangle_ratio ); mRequestedErrorThreshold[lod] = lod_error_threshold; glodGroupParameteri(mGroup, GLOD_ADAPT_MODE, lod_mode); |