diff options
| author | andreykproductengine <none@none> | 2016-06-21 16:25:18 +0300 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2016-06-21 16:25:18 +0300 |
| commit | 84396f4e279e63d536af37784e50e063185c161d (patch) | |
| tree | f906e9b9a71734d1b8034e4feedcf139c6e49549 | |
| parent | 0070a5f964a01c4595a8daa5ab485b447f183152 (diff) | |
MAINT-6513 Math rounding errors
| -rwxr-xr-x | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 2dbd3783f2..30465d8cfb 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -192,7 +192,8 @@ Ansariel Hiller MAINT-4677 MAINT-6300 MAINT-6397 - MAINT-6432 + MAINT-6432 + MAINT-6513 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 36bdcf4d89..20d8119606 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1411,7 +1411,7 @@ void LLAvatarComplexityControls::setIndirectMaxArc() else { // This is the inverse of the calculation in updateMaxComplexity - indirect_max_arc = (U32)((log(max_arc) - MIN_ARC_LOG) / ARC_LIMIT_MAP_SCALE) + MIN_INDIRECT_ARC_LIMIT; + indirect_max_arc = (U32)ll_round(((log(F32(max_arc)) - MIN_ARC_LOG) / ARC_LIMIT_MAP_SCALE)) + MIN_INDIRECT_ARC_LIMIT; } gSavedSettings.setU32("IndirectMaxComplexity", indirect_max_arc); } @@ -1930,7 +1930,7 @@ void LLAvatarComplexityControls::updateMax(LLSliderCtrl* slider, LLTextBox* valu { // if this is changed, the inverse calculation in setIndirectMaxArc // must be changed to match - max_arc = (U32)exp(MIN_ARC_LOG + (ARC_LIMIT_MAP_SCALE * (indirect_value - MIN_INDIRECT_ARC_LIMIT))); + max_arc = (U32)ll_round(exp(MIN_ARC_LOG + (ARC_LIMIT_MAP_SCALE * (indirect_value - MIN_INDIRECT_ARC_LIMIT)))); } gSavedSettings.setU32("RenderAvatarMaxComplexity", (U32)max_arc); |