diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-13 17:11:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-13 17:11:19 -0400 |
| commit | c7c7726c6f6c76950d47f9f640993bb80c659300 (patch) | |
| tree | cf5654661a81e331e1b4d14c45ee80b7fa83929c /indra/newview/llassetuploadqueue.cpp | |
| parent | 753e8673c30f7d5c87e0e6e86c36482f9b103983 (diff) | |
| parent | 8d4c6771fdbea274eabc7a2e2606b3b77952cb4a (diff) | |
merge changes for drtvwr-135
Diffstat (limited to 'indra/newview/llassetuploadqueue.cpp')
| -rw-r--r-- | indra/newview/llassetuploadqueue.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadqueue.cpp b/indra/newview/llassetuploadqueue.cpp index 7e50098a17..f943759bb8 100644 --- a/indra/newview/llassetuploadqueue.cpp +++ b/indra/newview/llassetuploadqueue.cpp @@ -123,7 +123,9 @@ public: for(LLSD::array_const_iterator line = compile_errors.beginArray(); line < compile_errors.endArray(); line++) { - mSupplier->log(line->asString()); + std::string str = line->asString(); + str.erase(std::remove(str.begin(), str.end(), '\n'), str.end()); + mSupplier->log(str); llinfos << content["errors"] << llendl; } } |