livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-310: Switching the cpu time display from milliseconds to microseconds to properly indicate the correct values.

meow-7.2.2
Todd Stinson 2012-02-17 11:37:49 -08:00
parent 4db56b229f
commit 35b09a722e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterpathfindingcharacters.cpp
View File

@ -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";

1
indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
View File

@ -23,6 +23,7 @@
<floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
<floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
<floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string>
<floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
<scroll_list
column_padding="0"
draw_heading="true"