From d26bf4cbd2eabd11ae9043f15a8ca51b4aad9318 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Wed, 26 Mar 2025 03:02:48 +1000 Subject: [PATCH] Fixes exporting textures getting downscaled and compressed, and a minor comment fix. --- indra/newview/daeexport.cpp | 2 ++ indra/newview/llagentbenefits.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index 4f29268e11..bb2562b1ff 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -428,6 +428,8 @@ void ColladaExportFloater::CacheReadResponder::completed(bool success) // For other formats we need to decode first if (mFormattedImage->updateData() && ( (mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()) != 0 ) ) { + mFormattedImage->setDiscardLevel(0); // [FIRE-35292] Fix for textures getting downscaled and compressed + LLPointer raw = new LLImageRaw; raw->resize(mFormattedImage->getWidth(), mFormattedImage->getHeight(), mFormattedImage->getComponents()); diff --git a/indra/newview/llagentbenefits.cpp b/indra/newview/llagentbenefits.cpp index 5b737e35f3..01a701094d 100644 --- a/indra/newview/llagentbenefits.cpp +++ b/indra/newview/llagentbenefits.cpp @@ -220,7 +220,7 @@ S32 LLAgentBenefits::getPicksLimit() const } else { - constexpr S32 MAX_OPENSIM_PICKS_FALLBACK = 20; // [FIRE-35276] Freeze on OpenSim (default agreed with Ubit Umarov) (originally by Haklezz) + constexpr S32 MAX_OPENSIM_PICKS_FALLBACK = 20; // [FIRE-35276] Freeze on OpenSim (default agreed with Ubit Umarov) (originally by Hecklezz) S32 max_profile_picks = MAX_OPENSIM_PICKS_FALLBACK; @@ -234,7 +234,7 @@ S32 LLAgentBenefits::getPicksLimit() const } } return max_profile_picks; - } + } // }