aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreviewscript.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 68af0ce..3e2a476 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -960,7 +960,7 @@ void LLScriptEdCore::onErrorList(LLUICtrl*, void* user_data)
960 S32 row = 0; 960 S32 row = 0;
961 S32 column = 0; 961 S32 column = 0;
962 const LLScrollListCell* cell = item->getColumn(0); 962 const LLScrollListCell* cell = item->getColumn(0);
963 LLString line(cell->getText()); 963 LLString line(cell->getValue().asString());
964 line.erase(0, 1); 964 line.erase(0, 1);
965 LLString::replaceChar(line, ',',' '); 965 LLString::replaceChar(line, ',',' ');
966 LLString::replaceChar(line, ')',' '); 966 LLString::replaceChar(line, ')',' ');
@@ -1134,8 +1134,8 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
1134void LLPreviewLSL::callbackLSLCompileSucceeded() 1134void LLPreviewLSL::callbackLSLCompileSucceeded()
1135{ 1135{
1136 llinfos << "LSL Bytecode saved" << llendl; 1136 llinfos << "LSL Bytecode saved" << llendl;
1137 mScriptEd->mErrorList->addSimpleItem("Compile successful!"); 1137 mScriptEd->mErrorList->addCommentText("Compile successful!");
1138 mScriptEd->mErrorList->addSimpleItem("Save complete."); 1138 mScriptEd->mErrorList->addCommentText("Save complete.");
1139 closeIfNeeded(); 1139 closeIfNeeded();
1140} 1140}
1141 1141
@@ -1681,8 +1681,8 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
1681 bool is_script_running) 1681 bool is_script_running)
1682{ 1682{
1683 lldebugs << "LSL Bytecode saved" << llendl; 1683 lldebugs << "LSL Bytecode saved" << llendl;
1684 mScriptEd->mErrorList->addSimpleItem("Compile successful!"); 1684 mScriptEd->mErrorList->addCommentText("Compile successful!");
1685 mScriptEd->mErrorList->addSimpleItem("Save complete."); 1685 mScriptEd->mErrorList->addCommentText("Save complete.");
1686 closeIfNeeded(); 1686 closeIfNeeded();
1687} 1687}
1688 1688
@@ -2207,7 +2207,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
2207 else 2207 else
2208 { 2208 {
2209 llinfos << "Compile worked!" << llendl; 2209 llinfos << "Compile worked!" << llendl;
2210 mScriptEd->mErrorList->addSimpleItem("Compile successful, saving..."); 2210 mScriptEd->mErrorList->addCommentText("Compile successful, saving...");
2211 if(gAssetStorage) 2211 if(gAssetStorage)
2212 { 2212 {
2213 llinfos << "LLLiveLSLEditor::saveAsset " 2213 llinfos << "LLLiveLSLEditor::saveAsset "
@@ -2281,7 +2281,7 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
2281 if(self) 2281 if(self)
2282 { 2282 {
2283 // Tell the user that the compile worked. 2283 // Tell the user that the compile worked.
2284 self->mScriptEd->mErrorList->addSimpleItem("Save complete."); 2284 self->mScriptEd->mErrorList->addCommentText("Save complete.");
2285 // close the window if this completes both uploads 2285 // close the window if this completes both uploads
2286 self->getWindow()->decBusyCount(); 2286 self->getWindow()->decBusyCount();
2287 self->mPendingUploads--; 2287 self->mPendingUploads--;