summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadqueue.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-04-06 10:15:01 -0400
committerOz Linden <oz@lindenlab.com>2012-04-06 10:15:01 -0400
commit999e0bcc2c58d7e722792f94118016d8ed024c7e (patch)
tree166ffcc2e8f6a36dfa1c8ae3d49520c2266d1397 /indra/newview/llassetuploadqueue.cpp
parent564121fca4593b6a877ff6622c23a8fd6540c7dc (diff)
parente4782045260259b59c3f91a2c5132fc6cf429622 (diff)
merge fix for storm-1833
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;
}
}