livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ll_convert_string_to_utf8_string() only exists on advanced Windows tech as of now... ;)

meow-7.2.2
Ansariel 2020-11-10 20:12:56 +01:00
parent c86ba9b2d9
commit d8ec4acb4d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llcommon/llstring.cpp
View File

@ -1301,9 +1301,12 @@ void LLStringUtil::formatNumber(std::string& numStr, std::string decimals)
if (convertToS32(numStr, intStr))
{
strStream << intStr;
numStr = strStream.str();
// <FS:Ansariel> FIRE-6070: Fix random symbols in formatted numbers in some locales
//numStr = strStream.str();
numStr = ll_convert_string_to_utf8_string(strStream.str());
#ifdef LL_WINDOWS
numStr = ll_convert_string_to_utf8_string(numStr);
#endif
// </FS:Ansariel>
}
}
else
@ -1313,9 +1316,12 @@ void LLStringUtil::formatNumber(std::string& numStr, std::string decimals)
if (convertToF32(numStr, floatStr))
{
strStream << std::fixed << std::showpoint << std::setprecision(intDecimals) << floatStr;
numStr = strStream.str();
// <FS:Ansariel> FIRE-6070: Fix random symbols in formatted numbers in some locales
//numStr = strStream.str();
numStr = ll_convert_string_to_utf8_string(strStream.str());
#ifdef LL_WINDOWS
numStr = ll_convert_string_to_utf8_string(numStr);
#endif
// </FS:Ansariel>
}
}
}