diff options
| author | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
| commit | 23711c927561ee85b6d46e7e741cdc652649686e (patch) | |
| tree | 4b8c89671594efb2241f894011f9548ae901df76 /indra/newview/llfloaterpathfindingcharacters.cpp | |
| parent | 6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff) | |
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpathfindingcharacters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index 69c9d94dfa..87f927ff65 100755 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -224,7 +224,7 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListItemData(const LLPa columns[2]["column"] = "owner"; columns[2]["value"] = getOwnerName(pCharacterPtr); - S32 cpuTime = llround(pCharacterPtr->getCPUTime()); + S32 cpuTime = ll_round(pCharacterPtr->getCPUTime()); std::string cpuTimeString = llformat("%d", cpuTime); LLStringUtil::format_map_t string_args; string_args["[CPU_TIME]"] = cpuTimeString; |