summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadqueue.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2012-06-15 14:17:21 -0700
committercallum <none@none>2012-06-15 14:17:21 -0700
commit0ff6275a654eda55662fab8d89d9ff4d278438d8 (patch)
treecc9bee7b3aae707870405fa5ee58589c8d6161f3 /indra/newview/llassetuploadqueue.cpp
parent4985938269a91387e481731d469a0f1ca34e22a8 (diff)
parenta1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff)
Merge with tip
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;
}
}