summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-04-06 09:04:51 -0400
committerJonathan Yap <none@none>2012-04-06 09:04:51 -0400
commite4782045260259b59c3f91a2c5132fc6cf429622 (patch)
tree659a813da970fd051c1e9677baf6f1cb32243628 /indra/newview
parent439a7df6ba40e34d390eee7849879a41cc2785de (diff)
STORM-1833 Square char is presented in list of recompilation for script with error
Subtask of STORM-637
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llassetuploadqueue.cpp4
-rw-r--r--indra/newview/llcompilequeue.cpp1
2 files changed, 3 insertions, 2 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;
}
}
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 91cf630932..4f5f9e22b6 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -159,7 +159,6 @@ void LLFloaterScriptQueue::addObject(const LLUUID& id)
BOOL LLFloaterScriptQueue::start()
{
- //llinfos << "LLFloaterCompileQueue::start()" << llendl;
std::string buffer;
LLSelectMgr *mgr = LLSelectMgr::getInstance();