From 9da11f1db61ddb8bf4857d2ff1065a7b6b2e5b04 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Sat, 4 Jun 2016 03:14:46 -0700 Subject: [PATCH] Fixed script preprocessor from LL merge --- indra/newview/llpreviewscript.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 005bb37b68..d9c7d4fa2d 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -2207,7 +2207,10 @@ void LLPreviewLSL::saveIfNeeded(bool sync /*= true*/) mPendingUploads++; if (!url.empty()) { - std::string buffer(mScriptEd->mEditor->getText()); + // Script Preprocessor + // std::string buffer(mScriptEd->mEditor->getText()); + std::string buffer(mScriptEd->getScriptText()); + // Script Preprocessor LLBufferedAssetUploadInfo::invnUploadFinish_f proc = boost::bind(&LLPreviewLSL::finishedLSLUpload, _1, _4); // LLResourceUploadInfo::ptr_t uploadInfo(new LLScriptAssetUpload(mItemUUID, buffer, proc)); @@ -2813,7 +2816,10 @@ void LLLiveLSLEditor::saveIfNeeded(bool sync /*= true*/) if (!url.empty()) { - std::string buffer(mScriptEd->mEditor->getText()); + // Script Preprocessor + // std::string buffer(mScriptEd->mEditor->getText()); + std::string buffer(mScriptEd->getScriptText()); + // Script Preprocessor LLBufferedAssetUploadInfo::taskUploadFinish_f proc = boost::bind(&LLLiveLSLEditor::finishLSLUpload, _1, _2, _3, _4, isRunning); LLResourceUploadInfo::ptr_t uploadInfo(new LLScriptAssetUpload(mObjectUUID, mItemUUID,