diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/llui/llresmgr.cpp | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/llui/llresmgr.cpp')
| -rw-r--r-- | indra/llui/llresmgr.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index e77faa9fc1..0e1b9bfbef 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -247,8 +247,10 @@ char LLResMgr::getMonetaryThousandsSeparator() const // Sets output to a string of integers with monetary separators inserted according to the locale. -void LLResMgr::getMonetaryString( LLString& output, S32 input ) const +std::string LLResMgr::getMonetaryString( S32 input ) const { + std::string output; + LLLocale locale(LLLocale::USER_LOCALE); struct lconv *conv = localeconv(); @@ -295,7 +297,6 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const LLString digits = llformat("%u", abs(input)); if( !grouping || !grouping[0] ) { - output.assign("L$"); if( negative_before ) { output.append( negative_sign ); @@ -305,7 +306,7 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const { output.append( negative_sign ); } - return; + return output; } S32 groupings[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -367,7 +368,6 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const forward_output[ output_pos - 1 - i ] = reversed_output[ i ]; } - output.assign("L$"); if( negative_before ) { output.append( negative_sign ); @@ -377,6 +377,7 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const { output.append( negative_sign ); } + return output; } void LLResMgr::getIntegerString( LLString& output, S32 input ) const |