Fixes exporting textures getting downscaled and compressed, and a minor comment fix.
parent
16a2414207
commit
d26bf4cbd2
|
|
@ -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); // <FS/> [FIRE-35292] Fix for textures getting downscaled and compressed
|
||||
|
||||
LLPointer<LLImageRaw> raw = new LLImageRaw;
|
||||
raw->resize(mFormattedImage->getWidth(), mFormattedImage->getHeight(), mFormattedImage->getComponents());
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue