diff options
| author | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
| commit | af142618f9c18a418bd11ab8eae6c83caa03ddac (patch) | |
| tree | fbdfb3f954bf68df568c1dc898b0dc261ad77873 /indra/llcommon/llsdserialize.cpp | |
| parent | ae2cbe5258ad76e22420be2760379480e10fb72c (diff) | |
| parent | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 5be5ecc492..bf62600514 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2036,7 +2036,9 @@ std::string zip_llsd(LLSD& data) { //copy result into output if (strm.avail_out >= CHUNK) { - llerrs << "WTF?" << llendl; + free(output); + llwarns << "Failed to compress LLSD block." << llendl; + return std::string(); } have = CHUNK-strm.avail_out; |