livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed script preprocessor from LL merge

meow-7.2.2
Kadah_Coba 2016-06-04 03:14:46 -07:00
parent f31191a1d1
commit 9da11f1db6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpreviewscript.cpp
View File

@ -2207,7 +2207,10 @@ void LLPreviewLSL::saveIfNeeded(bool sync /*= true*/)
mPendingUploads++;
if (!url.empty())
{
std::string buffer(mScriptEd->mEditor->getText());
//<FS:KC> Script Preprocessor
// std::string buffer(mScriptEd->mEditor->getText());
std::string buffer(mScriptEd->getScriptText());
//</FS:KC> 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());
//<FS:KC> Script Preprocessor
// std::string buffer(mScriptEd->mEditor->getText());
std::string buffer(mScriptEd->getScriptText());
//</FS:KC> Script Preprocessor
LLBufferedAssetUploadInfo::taskUploadFinish_f proc = boost::bind(&LLLiveLSLEditor::finishLSLUpload, _1, _2, _3, _4, isRunning);
LLResourceUploadInfo::ptr_t uploadInfo(new LLScriptAssetUpload(mObjectUUID, mItemUUID,