summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadqueue.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
committerDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
commit2d3790b2396534de096244bf7b7660ec5ec3a139 (patch)
tree1cbe6616b0f1ef728370b73ad453857caf2eb53e /indra/newview/llassetuploadqueue.cpp
parent2a62ca5b96d08ad2f24e8a60e161657a7222aba6 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes
Diffstat (limited to 'indra/newview/llassetuploadqueue.cpp')
-rw-r--r--indra/newview/llassetuploadqueue.cpp4
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;
}
}