diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:44:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:44:18 +0100 |
| commit | 08647d14c256cd6959a9853dc194614771a19501 (patch) | |
| tree | cee1dbf7c126b0bc8e20ae36c5adc3055f2ba145 /indra/newview/llpanelmaininventory.cpp | |
| parent | 7a3a192f790992bbb83461c0d24036580bfc3cdc (diff) | |
| parent | 6f640f86ca09e16df5db5316f3e953d8c633249a (diff) | |
slightly hairy merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 3e12f0ba9a..56b73fe55b 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -567,7 +567,8 @@ void LLPanelMainInventory::draw() void LLPanelMainInventory::updateItemcountText() { - LLLocale locale(LLLocale::USER_LOCALE); + // *TODO: Calling setlocale() on each frame may be inefficient. + LLLocale locale(LLStringUtil::getLocale()); std::string item_count_string; LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); |