diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llmessage/partsyspacket.cpp | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llmessage/partsyspacket.cpp')
| -rwxr-xr-x | indra/llmessage/partsyspacket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/partsyspacket.cpp b/indra/llmessage/partsyspacket.cpp index ad21614258..d87de38aa5 100755 --- a/indra/llmessage/partsyspacket.cpp +++ b/indra/llmessage/partsyspacket.cpp @@ -28,7 +28,7 @@ #include "linden_common.h" #include "partsyspacket.h" -#include "imageids.h" +#include "indra_constants.h" // this function is global void gSetInitDataDefaults(LLPartInitData *setMe) @@ -1272,7 +1272,7 @@ BOOL LLPartSysCompressedPacket::fromUnsignedBytes(U8 *in, U32 bytesUsed) } else { - llerrs << "NULL input data or number of bytes exceed mData size" << llendl; + LL_ERRS() << "NULL input data or number of bytes exceed mData size" << LL_ENDL; return FALSE; } } |