From 35b09a722e72a397a1e1e7aacbda8f39f4c1faa5 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 17 Feb 2012 11:37:49 -0800 Subject: PATH-310: Switching the cpu time display from milliseconds to microseconds to properly indicate the correct values. --- indra/newview/llfloaterpathfindingcharacters.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp') diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index b697de0d04..e2e1921cc6 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -439,6 +439,7 @@ void LLFloaterPathfindingCharacters::updateCharactersList() mCharactersScrollList->deleteAllItems(); updateCharactersStatusMessage(); + LLLocale locale(LLStringUtil::getLocale()); for (PathfindingCharacterMap::const_iterator characterIter = mPathfindingCharacters.begin(); characterIter != mPathfindingCharacters.end(); ++characterIter) { @@ -458,8 +459,15 @@ void LLFloaterPathfindingCharacters::updateCharactersList() columns[2]["value"] = character.getOwnerName(); columns[2]["font"] = "SANSSERIF"; + S32 cpuTime = llround(character.getCPUTime()); + std::string cpuTimeString; + LLResMgr::getInstance()->getIntegerString(cpuTimeString, cpuTime); + + LLStringUtil::format_map_t string_args; + string_args["[CPU_TIME]"] = cpuTimeString; + columns[3]["column"] = "cpu_time"; - columns[3]["value"] = llformat("%3.0f ms", character.getCPUTime()); + columns[3]["value"] = getString("character_cpu_time", string_args); columns[3]["font"] = "SANSSERIF"; columns[4]["column"] = "altitude"; -- cgit v1.3