From 35b09a722e72a397a1e1e7aacbda8f39f4c1faa5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
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 +++++++++-
 .../skins/default/xui/en/floater_pathfinding_characters.xml    |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

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";
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 8cd220553f..e9d58c7a33 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -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"
-- 
cgit v1.2.3