summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-03-08 18:01:40 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-03-08 18:01:40 -0800
commit6fb42d7ae8315885fda23da440dce01aeee8eafb (patch)
tree65ef7eb3725059e5abc0bbbaae6edc1c78d66b54 /indra
parent125ca3d506eb07615c23dc4e553b76000b7d9f06 (diff)
PATH-349: BUGFIX Incorrect ordering of CPU time was only occurring in the case that the number of digitis in one of the CPU times exceeded 3 digits. In this scenario, the thousands comma was being inserted, and this comma was disrupting the comparison method. This fix is simply to use the standard integer formatting rather that the locale specific one.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterpathfindingcharacters.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index ae023bc06e..fd84af74e1 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -473,9 +473,7 @@ void LLFloaterPathfindingCharacters::updateCharactersList()
columns[2]["font"] = "SANSSERIF";
S32 cpuTime = llround(character.getCPUTime());
- std::string cpuTimeString;
- LLResMgr::getInstance()->getIntegerString(cpuTimeString, cpuTime);
-
+ std::string cpuTimeString = llformat("%d", cpuTime);
LLStringUtil::format_map_t string_args;
string_args["[CPU_TIME]"] = cpuTimeString;