diff options
| author | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
| commit | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (patch) | |
| tree | b61a1aa1775b3faca1baf492a969a51d7ce8b3fe /indra/llmessage/llpacketbuffer.cpp | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
| parent | 91850b6cfacb32ed32265ebd37ce7690dd79a0b0 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/llmessage/llpacketbuffer.cpp')
| -rwxr-xr-x | indra/llmessage/llpacketbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp index e69631eb3b..ccf991b1a7 100755 --- a/indra/llmessage/llpacketbuffer.cpp +++ b/indra/llmessage/llpacketbuffer.cpp @@ -29,7 +29,7 @@ #include "llpacketbuffer.h" #include "net.h" -#include "timing.h" +#include "lltimer.h" #include "llhost.h" /////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 if (size > NET_BUFFER_SIZE) { - llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl; + LL_ERRS() << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << LL_ENDL; } else { |