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/llmessage/message.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/llmessage/message.cpp')
-rwxr-xr-x | indra/llmessage/message.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index cc2d5d66ad..0c3c14969b 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -2752,7 +2752,7 @@ void LLMessageSystem::dumpReceiveCounts() if (mt->mReceiveCount > 0) { LL_INFOS("Messaging") << "Num: " << std::setw(3) << mt->mReceiveCount << " Bytes: " << std::setw(6) << mt->mReceiveBytes - << " Invalid: " << std::setw(3) << mt->mReceiveInvalid << " " << mt->mName << " " << llround(100 * mt->mDecodeTimeThisFrame / mReceiveTime.value()) << "%" << LL_ENDL; + << " Invalid: " << std::setw(3) << mt->mReceiveInvalid << " " << mt->mName << " " << ll_round(100 * mt->mDecodeTimeThisFrame / mReceiveTime.value()) << "%" << LL_ENDL; } } } |