diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llui/llresmgr.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llui/llresmgr.cpp')
-rw-r--r-- | linden/indra/llui/llresmgr.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp index b5b9174..bd05d43 100644 --- a/linden/indra/llui/llresmgr.cpp +++ b/linden/indra/llui/llresmgr.cpp | |||
@@ -292,7 +292,7 @@ std::string LLResMgr::getMonetaryString( S32 input ) const | |||
292 | BOOL negative_before = negative && (conv->n_sign_posn != 2); | 292 | BOOL negative_before = negative && (conv->n_sign_posn != 2); |
293 | BOOL negative_after = negative && (conv->n_sign_posn == 2); | 293 | BOOL negative_after = negative && (conv->n_sign_posn == 2); |
294 | 294 | ||
295 | LLString digits = llformat("%u", abs(input)); | 295 | std::string digits = llformat("%u", abs(input)); |
296 | if( !grouping || !grouping[0] ) | 296 | if( !grouping || !grouping[0] ) |
297 | { | 297 | { |
298 | if( negative_before ) | 298 | if( negative_before ) |
@@ -378,10 +378,10 @@ std::string LLResMgr::getMonetaryString( S32 input ) const | |||
378 | return output; | 378 | return output; |
379 | } | 379 | } |
380 | 380 | ||
381 | void LLResMgr::getIntegerString( LLString& output, S32 input ) const | 381 | void LLResMgr::getIntegerString( std::string& output, S32 input ) const |
382 | { | 382 | { |
383 | S32 fraction = 0; | 383 | S32 fraction = 0; |
384 | LLString fraction_string; | 384 | std::string fraction_string; |
385 | S32 remaining_count = input; | 385 | S32 remaining_count = input; |
386 | while(remaining_count > 0) | 386 | while(remaining_count > 0) |
387 | { | 387 | { |
@@ -415,16 +415,16 @@ void LLResMgr::getIntegerString( LLString& output, S32 input ) const | |||
415 | } | 415 | } |
416 | } | 416 | } |
417 | 417 | ||
418 | const LLString LLFONT_ID_NAMES[] = | 418 | const std::string LLFONT_ID_NAMES[] = |
419 | { | 419 | { |
420 | LLString("OCRA"), | 420 | std::string("OCRA"), |
421 | LLString("SANSSERIF"), | 421 | std::string("SANSSERIF"), |
422 | LLString("SANSSERIF_SMALL"), | 422 | std::string("SANSSERIF_SMALL"), |
423 | LLString("SANSSERIF_BIG"), | 423 | std::string("SANSSERIF_BIG"), |
424 | LLString("SMALL"), | 424 | std::string("SMALL"), |
425 | }; | 425 | }; |
426 | 426 | ||
427 | const LLFontGL* LLResMgr::getRes( LLString font_id ) const | 427 | const LLFontGL* LLResMgr::getRes( std::string font_id ) const |
428 | { | 428 | { |
429 | for (S32 i=0; i<LLFONT_COUNT; ++i) | 429 | for (S32 i=0; i<LLFONT_COUNT; ++i) |
430 | { | 430 | { |
@@ -437,21 +437,21 @@ const LLFontGL* LLResMgr::getRes( LLString font_id ) const | |||
437 | } | 437 | } |
438 | 438 | ||
439 | #if LL_WINDOWS | 439 | #if LL_WINDOWS |
440 | const LLString LLLocale::USER_LOCALE("English_United States.1252");// = LLString::null; | 440 | const std::string LLLocale::USER_LOCALE("English_United States.1252");// = LLStringUtil::null; |
441 | const LLString LLLocale::SYSTEM_LOCALE("English_United States.1252"); | 441 | const std::string LLLocale::SYSTEM_LOCALE("English_United States.1252"); |
442 | #elif LL_DARWIN | 442 | #elif LL_DARWIN |
443 | const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null; | 443 | const std::string LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLStringUtil::null; |
444 | const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); | 444 | const std::string LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); |
445 | #elif LL_SOLARIS | 445 | #elif LL_SOLARIS |
446 | const LLString LLLocale::USER_LOCALE("en_US.ISO8859-1"); | 446 | const std::string LLLocale::USER_LOCALE("en_US.ISO8859-1"); |
447 | const LLString LLLocale::SYSTEM_LOCALE("C"); | 447 | const std::string LLLocale::SYSTEM_LOCALE("C"); |
448 | #else // LL_LINUX likes this | 448 | #else // LL_LINUX likes this |
449 | const LLString LLLocale::USER_LOCALE("en_US.utf8"); | 449 | const std::string LLLocale::USER_LOCALE("en_US.utf8"); |
450 | const LLString LLLocale::SYSTEM_LOCALE("C"); | 450 | const std::string LLLocale::SYSTEM_LOCALE("C"); |
451 | #endif | 451 | #endif |
452 | 452 | ||
453 | 453 | ||
454 | LLLocale::LLLocale(const LLString& locale_string) | 454 | LLLocale::LLLocale(const std::string& locale_string) |
455 | { | 455 | { |
456 | mPrevLocaleString = setlocale( LC_ALL, NULL ); | 456 | mPrevLocaleString = setlocale( LC_ALL, NULL ); |
457 | char* new_locale_string = setlocale( LC_ALL, locale_string.c_str()); | 457 | char* new_locale_string = setlocale( LC_ALL, locale_string.c_str()); |