summaryrefslogtreecommitdiff
path: root/indra/llui/llresmgr.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-23 10:26:28 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-23 10:26:28 +0300
commit3c4f82b2984c0cf70b2bc61190495cf9cf1a6aad (patch)
tree54e39bcaa704c80d9ad2c99d74928f91ea50b74e /indra/llui/llresmgr.cpp
parentf6c08d45108d713fc42786885d1d38a4b95c10ac (diff)
EXT-8318 ADDITIONAL FIXED ensure that thousands separator is in utf8 format (on Windows) before converting it to LLWString.
Problem on Windows: ================== LLPanelMainInventory::updateItemcountText() formats number using viewer locale. non-break space is detected as unknown symbols while converting utf8str_to_wstring when formatted text is set to LLTextBox. FIX: === Added converting of string to multi-byte string and then to utf8 string while formatting on Windows. created opposite to "ll_convert_wide_to_string" function "ll_convert_string_to_wide" and helper function to call both of them. It is used now to convert result of formatted string while formatting integer number in locale. Fix affects Windows only. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/ --HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llresmgr.cpp')
-rw-r--r--indra/llui/llresmgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp
index ed870d46d5..9158bc70f5 100644
--- a/indra/llui/llresmgr.cpp
+++ b/indra/llui/llresmgr.cpp
@@ -298,11 +298,11 @@ void LLResMgr::getIntegerString( std::string& output, S32 input ) const
{
if (fraction == remaining_count)
{
- fraction_string = llformat("%d%c", fraction, getThousandsSeparator());
+ fraction_string = llformat_to_utf8("%d%c", fraction, getThousandsSeparator());
}
else
{
- fraction_string = llformat("%3.3d%c", fraction, getThousandsSeparator());
+ fraction_string = llformat_to_utf8("%3.3d%c", fraction, getThousandsSeparator());
}
output = fraction_string + output;
}