diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
| commit | b01c75cb423f07a3d3354f8bd62f265f80062b3b (patch) | |
| tree | dec1b220c24a60cc220d1cb07fd3545610644f0a /indra/llui/llresmgr.cpp | |
| parent | 868250bdd74f348557102c0d8408d9bec30331f6 (diff) | |
svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
Diffstat (limited to 'indra/llui/llresmgr.cpp')
| -rw-r--r-- | indra/llui/llresmgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 32d3d1f752..141b08c39d 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -257,6 +257,8 @@ std::string LLResMgr::getMonetaryString( S32 input ) const // On the Mac, locale support is broken before 10.4, which causes things to go all pear-shaped. // Fake up a conv structure with some reasonable values for the fields this function uses. struct lconv fakeconv; + char fake_neg[2] = "-"; + char fake_mon_group[4] = "\x03\x03\x00"; // commas every 3 digits if(conv->negative_sign[0] == 0) // Real locales all seem to have something here... { fakeconv = *conv; // start with what's there. @@ -265,8 +267,8 @@ std::string LLResMgr::getMonetaryString( S32 input ) const default: // Unknown -- use the US defaults. case LLLOCALE_USA: case LLLOCALE_UK: // UK ends up being the same as US for the items used here. - fakeconv.negative_sign = "-"; - fakeconv.mon_grouping = "\x03\x03\x00"; // commas every 3 digits + fakeconv.negative_sign = fake_neg; + fakeconv.mon_grouping = fake_mon_group; fakeconv.n_sign_posn = 1; // negative sign before the string break; } |