diff --git a/autobuild.xml b/autobuild.xml
index 2d85129fccfc92572bb6a901263211758b0bbb2f..77453f30521e1660aac9ed03e44b415ee709e26d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1980,11 +1980,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>ab2e04d95b0c62951dd7ea1762463fef8aac883bbc494610ed833f2abfe418978da69229998fda56a437c883903522a338f5e843ea1e87dc4c74b3417c63a33f</string>
+ <string>42ae27903974f99d8ca3bed1a5c31ce7b909a14194e1e3337e8c4bcaa15badf68f71b66aac8ebfa57cac99302a2417cde2c80669110b639962e8665a95ccf437</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/8.3.3-0.6.0.1939/sentry-8.3.3-0.6.0-linux64-1939.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/8.3.3-0.6.0.2092/sentry-8.3.3-0.6.0-linux64-2092.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -1994,11 +1994,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>4b46741ec2733772b4e5e463156efd4fb3eab401a7ee2f9a9cb3d2cef322e5428a4f451fac4b5c7f5f17e3a18c0f094e5a3c57395ffc9cd54bf9b063a408741b</string>
+ <string>0a7be6df6cf4e705e55e5d3361db0394aa9c23007ffac62cd5e4d7ed0c3e14798ef9f1b1968be17073a010e4b8ad45a408886926700dd3cf6c122da96ca4d9b1</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/8.3.3-0.6.0.1939/sentry-8.3.3-0.6.0-windows64-1939.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/8.3.3-0.6.0.2092/sentry-8.3.3-0.6.0-windows64-2092.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 24f4403a0cf45dde7d4ad8cf109dee4936c554fc..83225cafb1b17bb3d77ddc23dc57f0216f09a839 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -279,7 +279,7 @@ LLSD LLSettingsBase::interpolateSDValue(const std::string& key_name, const LLSD
{
case LLSD::TypeInteger:
// lerp between the two values rounding the result to the nearest integer.
- new_value = LLSD::Integer(llroundf(ll_lerp(value.asReal(), other_value.asReal(), mix)));
+ new_value = LLSD::Integer(ll_round(ll_lerp(value.asReal(), other_value.asReal(), mix)));
break;
case LLSD::TypeReal:
// lerp between the two values.
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index 6c4a38dbb646d993fff185264ac1cd733c96ea5c..7fd48a1496fa8bf82d0e53835d1dc082fd5d1947 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -300,7 +300,7 @@ F32 LLSettingsWater::getModifiedWaterFogDensityFast(F32 fog_density, F32 underwa
// 2) Force density to be an arbitrary non-negative (i.e. 1) when underwater and modifier is not an integer (1 was aribtrarily chosen as it gives at least some notion of fog in the transition)
// This is more restrictive, effectively forcing a density under certain conditions, but allowing the range of #1 and avoiding blackness in other cases
// at the cost of overriding the fog density.
- if(fog_density < 0.0f && underwater_fog_mod != (F32)llround(underwater_fog_mod) )
+ if(fog_density < 0.0f && underwater_fog_mod != (F32)ll_round(underwater_fog_mod) )
{
fog_density = 1.0f;
}
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index af19001aa345f9949bdae44022b6405cee0a3fab..f814458cdb6fb895ccfc58287f53dc58789848cb 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1954,7 +1954,7 @@ void* LLWindowWin32::createSharedContext()
mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 4.6f);
S32 version_major = llfloor(mMaxGLVersion);
- S32 version_minor = llround((mMaxGLVersion-version_major)*10);
+ S32 version_minor = ll_round((mMaxGLVersion-version_major)*10);
S32 attribs[] =
{
diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index 19fc3e673e41f0a2523291cf7fcb14fa24528ad5..74ecdb4a4b91b543d2f04a561c9fb391174bea20 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -511,7 +511,7 @@ void LLFloaterPerformance::populateNearbyList()
void LLFloaterPerformance::setFPSText()
{
const S32 NUM_PERIODS = 50;
- S32 current_fps = (S32)llround(LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS, NUM_PERIODS));
+ S32 current_fps = (S32)ll_round(LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS, NUM_PERIODS));
getChild<LLTextBox>("fps_value")->setValue(current_fps);
std::string fps_text = getString("fps_text");
diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp
index 64e66d520b85877da249314a61235b1851fbd3e1..366f86879fc992a3e54fc22be5f2b4df0578824e 100644
--- a/indra/newview/llperfstats.cpp
+++ b/indra/newview/llperfstats.cpp
@@ -389,7 +389,7 @@ namespace LLPerfStats
auto tot_avatar_time_raw = ms_to_raw(sTotalAvatarTime);
// The frametime budget we have based on the target FPS selected
- auto target_frame_time_raw = (U64)llround(LLPerfStats::cpu_hertz / (target_fps == 0 ? 1 : target_fps));
+ auto target_frame_time_raw = (U64)ll_round(LLPerfStats::cpu_hertz / (target_fps == 0 ? 1 : target_fps));
// LL_INFOS() << "Effective FPS(raw):" << tot_frame_time_raw << " Target:" << target_frame_time_raw << LL_ENDL;
auto inferredFPS{1000/(U32)std::max(raw_to_ms(tot_frame_time_raw),1.0)};
U32 settingsChangeFrequency{inferredFPS > 50?inferredFPS:50};
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 12c8d32fa4fca925353db45869752ed1e9458560..a20b31b578cfa3ead8e7b2ac58f5ed0ada572e51 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -529,12 +529,12 @@ void update_statistics()
pct_scene_render_time = llclamp(pct_scene_render_time, 0., 100.);
if (tot_sleep_time_raw == 0)
{
- sample(LLStatViewer::SCENERY_FRAME_PCT, (U32)llround(pct_scene_render_time));
- sample(LLStatViewer::AVATAR_FRAME_PCT, (U32)llround(pct_avatar_time));
- sample(LLStatViewer::HUDS_FRAME_PCT, (U32)llround(pct_huds_time));
- sample(LLStatViewer::UI_FRAME_PCT, (U32)llround(pct_ui_time));
- sample(LLStatViewer::SWAP_FRAME_PCT, (U32)llround(pct_swap_time));
- sample(LLStatViewer::IDLE_FRAME_PCT, (U32)llround(pct_idle_time));
+ sample(LLStatViewer::SCENERY_FRAME_PCT, (U32)ll_round(pct_scene_render_time));
+ sample(LLStatViewer::AVATAR_FRAME_PCT, (U32)ll_round(pct_avatar_time));
+ sample(LLStatViewer::HUDS_FRAME_PCT, (U32)ll_round(pct_huds_time));
+ sample(LLStatViewer::UI_FRAME_PCT, (U32)ll_round(pct_ui_time));
+ sample(LLStatViewer::SWAP_FRAME_PCT, (U32)ll_round(pct_swap_time));
+ sample(LLStatViewer::IDLE_FRAME_PCT, (U32)ll_round(pct_idle_time));
}
}
else
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 5b11caf2c065d66388b27c119e0d7bc9cde41b08..2ad9418d1ab045fcf50d69f743b4c317c7ea7ed6 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -146,8 +146,8 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
S32 size_y = LLPipeline::sRenderTransparentWater ? 8 : 1;
const LLVector3& scale = getScale();
- size_x *= llmin(llround(scale.mV[0] / 256.f), 8);
- size_y *= llmin(llround(scale.mV[1] / 256.f), 8);
+ size_x *= llmin(ll_round(scale.mV[0] / 256.f), 8);
+ size_y *= llmin(ll_round(scale.mV[1] / 256.f), 8);
const S32 num_quads = size_x * size_y;
face->setSize(vertices_per_quad * num_quads,
@@ -199,8 +199,8 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
position_agent.mV[VX] += (x + 0.5f) * step_x;
position_agent.mV[VY] += (y + 0.5f) * step_y;
- position_agent.mV[VX] = llround(position_agent.mV[VX]);
- position_agent.mV[VY] = llround(position_agent.mV[VY]);
+ position_agent.mV[VX] = ll_round(position_agent.mV[VX]);
+ position_agent.mV[VY] = ll_round(position_agent.mV[VY]);
*verticesp++ = position_agent - right + up;
*verticesp++ = position_agent - right - up;