diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
| commit | d11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (patch) | |
| tree | 9f8e5e57d4ed074e148227c56556bcace90e2e3a /indra/llcommon/llsdserialize.cpp | |
| parent | c0c0a2b9a5f41fc06619330a81c34955a39ddfe2 (diff) | |
| parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) | |
Merge with latest lindenlab/viewer-development
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; |