1 files changed, 317 insertions, 222 deletions

diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index c13da9b..75371b2 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -30,6 +30,7 @@
 #include "llpreviewscript.h"
 
 #include "llassetstorage.h"
+#include "llassetuploadresponders.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
@@ -155,7 +156,7 @@ public:
         LLScriptEdCore* getEditorCore() { return mEditorCore; }
         static LLFloaterScriptSearch* getInstance() { return sInstance; }
 
-        void open();
+        void open();            /*Flawfinder: ignore*/
 
 private:
 
@@ -187,6 +188,18 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
         sInstance = this;
 
         childSetFocus("search_text", TRUE);
+
+        // find floater in which script panel is embedded
+        LLView* viewp = (LLView*)editor_core;
+        while(viewp)
+        {
+                if (viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
+                {
+                        ((LLFloater*)viewp)->addDependentFloater(this);
+                        break;
+                }
+                viewp = viewp->getParent();
+        }
 }
 
 //static 
@@ -208,7 +221,7 @@ void LLFloaterScriptSearch::show(LLScriptEdCore* editor_core)
                 new LLFloaterScriptSearch("Script Search",LLRect(left,top,left + SCRIPT_SEARCH_WIDTH,top - SCRIPT_SEARCH_HEIGHT),editor_core);
         }
 
-        sInstance->open();
+        sInstance->open();              /*Flawfinder: ignore*/
 }
 
 LLFloaterScriptSearch::~LLFloaterScriptSearch()
@@ -255,9 +268,9 @@ void LLFloaterScriptSearch::handleBtnReplaceAll()
         mEditorCore->mEditor->replaceTextAll(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
 }
 
-void LLFloaterScriptSearch::open()
+void LLFloaterScriptSearch::open()              /*Flawfinder: ignore*/
 {
-        LLFloater::open();
+        LLFloater::open();              /*Flawfinder: ignore*/
         childSetFocus("search_text", TRUE); 
 }
 /// ---------------------------------------------------------------------------
@@ -428,8 +441,8 @@ void LLScriptEdCore::draw()
                 S32 line = 0;
                 S32 column = 0;
                 mEditor->getCurrentLineAndColumn( &line, &column, FALSE );  // don't include wordwrap
-                char cursor_pos[STD_STRING_BUF_SIZE];
-                sprintf( cursor_pos, "Line %d, Column %d", line, column );
+                char cursor_pos[STD_STRING_BUF_SIZE];           /*Flawfinder: ignore*/
+                snprintf( cursor_pos, STD_STRING_BUF_SIZE, "Line %d, Column %d", line, column );                /*Flawfinder: ignore*/
                 childSetText("line_col", cursor_pos);
         }
         else
@@ -851,6 +864,33 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
         }
 }
 
+// virtual
+void LLPreviewLSL::callbackLSLCompileSucceeded()
+{
+        llinfos << "LSL Bytecode saved" << llendl;
+        mScriptEd->mErrorList->addSimpleItem("Compile successful!");
+        mScriptEd->mErrorList->addSimpleItem("Save complete.");
+        closeIfNeeded();
+}
+
+// virtual
+void LLPreviewLSL::callbackLSLCompileFailed(const LLSD& compile_errors)
+{
+        llinfos << "Compile failed!" << llendl;
+
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        LLScrollListItem* item = NULL;
+        for(LLSD::array_const_iterator line = compile_errors.beginArray();
+                line < compile_errors.endArray();
+                line++)
+        {
+                item = new LLScrollListItem();
+                item->addColumn(line->asString(), err_font);
+                mScriptEd->mErrorList->addItem(item);
+        }
+        mScriptEd->selectFirstError();
+        closeIfNeeded();
+}
 
 void LLPreviewLSL::loadAsset()
 {
@@ -912,10 +952,21 @@ BOOL LLPreviewLSL::canClose()
         return mScriptEd->canClose();
 }
 
+void LLPreviewLSL::closeIfNeeded()
+{
+        // Find our window and close it if requested.
+        getWindow()->decBusyCount();
+        mPendingUploads--;
+        if (mPendingUploads <= 0 && mCloseAfterSave)
+        {
+                close();
+        }
+}
+
 //override the llpreview open which attempts to load asset, load after xml ui made
-void LLPreviewLSL::open()
+void LLPreviewLSL::open()               /*Flawfinder: ignore*/
 {
-        LLFloater::open();
+        LLFloater::open();              /*Flawfinder: ignore*/
 }
 
 // static
@@ -933,152 +984,152 @@ void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
         self->saveIfNeeded();
 }
 
-
 // Save needs to compile the text in the buffer. If the compile
 // succeeds, then save both assets out to the database. If the compile
 // fails, go ahead and save the text anyway so that the user doesn't
 // get too fucked.
 void LLPreviewLSL::saveIfNeeded()
 {
-        // llinfos << "LLPreviewLSL::save()" << llendl;
-        if(!mScriptEd->mEditor->isPristine())
+        // llinfos << "LLPreviewLSL::saveIfNeeded()" << llendl;
+        if(mScriptEd->mEditor->isPristine())
         {
-                mPendingUploads = 0;
-                mScriptEd->mErrorList->deleteAllItems();
-                mScriptEd->mEditor->makePristine();
-
-                // We need to update the asset information
-                LLTransactionID tid;
-                LLAssetID uuid;
-                tid.generate();
-                uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-                char uuid_string[UUID_STR_LENGTH];
-                uuid.toString(uuid_string);
-                char filename[LL_MAX_PATH];
-                sprintf(filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                FILE* fp = LLFile::fopen(filename, "wb");
-                if(!fp)
-                {
-                        llwarns << "Unable to write to " << filename << llendl;
-                        LLScrollListItem* item = new LLScrollListItem();
-                        item->addColumn("Error writing to local file. Is your hard drive full?", LLFontGL::sSansSerifSmall);
-                        mScriptEd->mErrorList->addItem(item);
-                        return;
-                }
+                return;
+        }
 
-                LLString utf8text = mScriptEd->mEditor->getText();
-                //fprintf(fp, "%s|%s\n", LLAssetType::lookup(LLAssetType::AT_LSL_TEXT),
-                //uuid_string);
-                //fprintf(fp,"{\n%s}\n", text.c_str());
-                fputs(utf8text.c_str(), fp);
-                fclose(fp);
-                fp = NULL;
+        mPendingUploads = 0;
+        mScriptEd->mErrorList->deleteAllItems();
+        mScriptEd->mEditor->makePristine();
 
-                // also write it out to the vfs for upload
-                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_TEXT, LLVFile::APPEND);
-                S32 size = utf8text.length() + 1;
+        // save off asset into file
+        LLTransactionID tid;
+        tid.generate();
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string filename = llformat("%s.lsl", filepath.c_str());
 
-                file.setMaxSize(size);
-                file.write((U8*)utf8text.c_str(), size);
+        FILE* fp = LLFile::fopen(filename.c_str(), "wb");
+        if(!fp)
+        {
+                llwarns << "Unable to write to " << filename << llendl;
+                LLScrollListItem* item = new LLScrollListItem();
+                item->addColumn("Error writing to local file. Is your hard drive full?", LLFontGL::sSansSerifSmall);
+                mScriptEd->mErrorList->addItem(item);
+                return;
+        }
 
-                LLInventoryItem *inv_item = getItem();
+        LLString utf8text = mScriptEd->mEditor->getText();
+        fputs(utf8text.c_str(), fp);
+        fclose(fp);
+        fp = NULL;
 
-                // save it out to database
-                if(gAssetStorage && inv_item)
+        LLInventoryItem *inv_item = getItem();
+        // save it out to asset server
+        std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory");
+        if(inv_item)
+        {
+                getWindow()->incBusyCount();
+                mPendingUploads++;
+                if (!url.empty())
                 {
-                        getWindow()->incBusyCount();
-                        mPendingUploads++;
-                        LLScriptSaveInfo* info = NULL;
+                        uploadAssetViaCaps(url, filename, mItemUUID);
+                }
+                else if (gAssetStorage)
+                {
+                        uploadAssetLegacy(filename, mItemUUID, tid);
+                }
+        }
+}
 
-                        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+void LLPreviewLSL::uploadAssetViaCaps(const std::string& url,
+                                                                          const std::string& filename,
+                                                                          const LLUUID& item_id)
+{
+        llinfos << "Update Agent Inventory via capability" << llendl;
+        LLSD body;
+        body["item_id"] = item_id;
+        LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename));
+}
 
-                        info = new LLScriptSaveInfo(mItemUUID,
-                                                                                descEditor->getText(),
-                                                                                tid);
-                        gAssetStorage->storeAssetData(tid, LLAssetType::AT_LSL_TEXT, &LLPreviewLSL::onSaveComplete, info);
-                }
+void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
+                                                                          const LLUUID& item_id,
+                                                                          const LLTransactionID& tid)
+{
+        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+        LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
+                                                                descEditor->getText(),
+                                                                tid);
+        gAssetStorage->storeAssetData(filename.c_str(), tid,
+                                                                  LLAssetType::AT_LSL_TEXT,
+                                                                  &LLPreviewLSL::onSaveComplete,
+                                                                  info);
 
-                char dst_filename[LL_MAX_PATH];
-                sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                char err_filename[LL_MAX_PATH];
-                sprintf(err_filename, "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                LLScrollListItem* item = NULL;
-                const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
-                if(!lscript_compile(filename, dst_filename, err_filename, gAgent.isGodlike()))
-                {
-                        llinfos << "Compile failed!" << llendl;
-                        //char command[256];
-                        //sprintf(command, "type %s\n", err_filename);
-                        //system(command);
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        std::string err_filename = llformat("%s.out", filepath.c_str());
 
-                        // load the error file into the error scrolllist
-                        if(NULL != (fp = LLFile::fopen(err_filename, "r")))
+        LLScrollListItem* item = NULL;
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        if(!lscript_compile(filename.c_str(),
+                                                dst_filename.c_str(),
+                                                err_filename.c_str(),
+                                                gAgent.isGodlike()))
+        {
+                llinfos << "Compile failed!" << llendl;
+                //char command[256];
+                //sprintf(command, "type %s\n", err_filename);
+                //system(command);
+
+                // load the error file into the error scrolllist
+                FILE* fp = LLFile::fopen(err_filename.c_str(), "r");
+                if(fp)
+                {
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                        LLString line;
+                        while(!feof(fp)) 
                         {
-                                char buffer[MAX_STRING];
-                                LLString line;
-                                while(!feof(fp)) 
+                                fgets(buffer, MAX_STRING, fp);
+                                if(feof(fp))
                                 {
-                                        
-                                        fgets(buffer, MAX_STRING, fp);
-                                        if(feof(fp))
-                                        {
-                                                break;
-                                        }
-                                        else if(!buffer)
-                                        {
-                                                continue;
-                                        }
-                                        else
-                                        {
-                                                line.assign(buffer);
-                                                LLString::stripNonprintable(line);
-                                                item = new LLScrollListItem();
-                                                item->addColumn(line, err_font);
-                                                mScriptEd->mErrorList->addItem(item);
-                                        }
+                                        break;
                                 }
-                                fclose(fp);
-                                mScriptEd->selectFirstError();
-                        }
-                }
-                else
-                {
-                        llinfos << "Compile worked!" << llendl;
-                        if(gAssetStorage)
-                        {
-                                // move the compiled file into the vfs for transport
-                                FILE* fp = LLFile::fopen(dst_filename, "rb");
-                                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_BYTECODE, LLVFile::APPEND);
-
-                                fseek(fp, 0, SEEK_END);
-                                S32 size = ftell(fp);
-                                fseek(fp, 0, SEEK_SET);
-
-                                file.setMaxSize(size);
-
-                                const S32 buf_size = 65536;
-                                U8 copy_buf[buf_size];
-                                while ((size = fread(copy_buf, 1, buf_size, fp)))
+                                else if(!buffer)
                                 {
-                                        file.write(copy_buf, size);
+                                        continue;
+                                }
+                                else
+                                {
+                                        line.assign(buffer);
+                                        LLString::stripNonprintable(line);
+                                        item = new LLScrollListItem();
+                                        item->addColumn(line, err_font);
+                                        mScriptEd->mErrorList->addItem(item);
                                 }
-                                fclose(fp);
-                                fp = NULL;
-                                getWindow()->incBusyCount();
-                                mPendingUploads++;
-                                LLUUID* this_uuid = new LLUUID(mItemUUID);
-                                gAssetStorage->storeAssetData(tid,
-                                                                                          LLAssetType::AT_LSL_BYTECODE,
-                                                                                          &LLPreviewLSL::onSaveBytecodeComplete,
-                                                                                          (void**)this_uuid);
                         }
+                        fclose(fp);
+                        mScriptEd->selectFirstError();
+                }
+        }
+        else
+        {
+                llinfos << "Compile worked!" << llendl;
+                if(gAssetStorage)
+                {
+                        getWindow()->incBusyCount();
+                        mPendingUploads++;
+                        LLUUID* this_uuid = new LLUUID(mItemUUID);
+                        gAssetStorage->storeAssetData(dst_filename.c_str(),
+                                                                                  tid,
+                                                                                  LLAssetType::AT_LSL_BYTECODE,
+                                                                                  &LLPreviewLSL::onSaveBytecodeComplete,
+                                                                                  (void**)this_uuid);
                 }
-
-                // get rid of any temp files left lying around
-                LLFile::remove(filename);
-                LLFile::remove(err_filename);
-                LLFile::remove(dst_filename);
         }
+
+        // get rid of any temp files left lying around
+        LLFile::remove(filename.c_str());
+        LLFile::remove(err_filename.c_str());
+        LLFile::remove(dst_filename.c_str());
 }
 
 
@@ -1184,7 +1235,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
                         S32 file_length = file.getSize();
 
                         char* buffer = new char[file_length+1];
-                        file.read((U8*)buffer, file_length);
+                        file.read((U8*)buffer, file_length);            /*Flawfinder: ignore*/
 
                         // put a EOS at the end
                         buffer[file_length] = 0;
@@ -1287,7 +1338,7 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
                                                                  const std::string& title,
                                                                  const LLUUID& object_id,
                                                                  const LLUUID& item_id) :
-        LLFloater(name, rect, title, TRUE, SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT),
+        LLPreview(name, rect, title, item_id, object_id, TRUE, SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT),
         mObjectID(object_id),
         mItemID(item_id),
         mScriptEd(NULL),
@@ -1346,6 +1397,40 @@ LLLiveLSLEditor::~LLLiveLSLEditor()
         LLLiveLSLEditor::sInstances.removeData(mItemID ^ mObjectID);
 }
 
+// this is called via LLPreview::loadAsset() virtual method
+void LLLiveLSLEditor::loadAsset()
+{
+        loadAsset(FALSE);
+}
+
+// virtual
+void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
+                                                                                                  const LLUUID& item_id,
+                                                                                                  bool is_script_running)
+{
+        lldebugs << "LSL Bytecode saved" << llendl;
+        mScriptEd->mErrorList->addSimpleItem("Compile successful!");
+        mScriptEd->mErrorList->addSimpleItem("Save complete.");
+        closeIfNeeded();
+}
+
+// virtual
+void LLLiveLSLEditor::callbackLSLCompileFailed(const LLSD& compile_errors)
+{
+        lldebugs << "Compile failed!" << llendl;
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        LLScrollListItem* item = NULL;
+        for(LLSD::array_const_iterator line = compile_errors.beginArray();
+                line < compile_errors.endArray();
+                line++)
+        {
+                item = new LLScrollListItem();
+                item->addColumn(line->asString(), err_font);
+                mScriptEd->mErrorList->addItem(item);
+        }
+        mScriptEd->selectFirstError();
+        closeIfNeeded();
+}
 
 void LLLiveLSLEditor::loadAsset(BOOL is_new)
 {
@@ -1377,6 +1462,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                 mScriptEd->mEditor->setText("You are not allowed to view this script.");
                                 mScriptEd->mEditor->makePristine();
                                 mScriptEd->mEditor->setEnabled(FALSE);
+                                mAssetStatus = PREVIEW_ASSET_LOADED;
                         }
                         else if(mItem.notNull())
                         {
@@ -1400,11 +1486,13 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                 msg->addUUIDFast(_PREHASH_ItemID, mItemID);
                                 msg->sendReliable(object->getRegion()->getHost());
                                 mAskedForRunningInfo = TRUE;
+                                mAssetStatus = PREVIEW_ASSET_LOADING;
                         }
                         else
                         {
                                 mScriptEd->mEditor->setText("");
                                 mScriptEd->mEditor->makePristine();
+                                mAssetStatus = PREVIEW_ASSET_LOADED;
                         }
 
                         if(item
@@ -1448,6 +1536,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                                                         LLSaleInfo::DEFAULT,
                                                                         LLInventoryItem::II_FLAGS_NONE,
                                                                         time_corrected());
+                mAssetStatus = PREVIEW_ASSET_LOADED;
         }
 }
 
@@ -1463,10 +1552,11 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
 
         if( LLLiveLSLEditor::sInstances.checkData(*xored_id) )
         {
+                instance = LLLiveLSLEditor::sInstances[*xored_id];
                 if( LL_ERR_NOERR == status )
                 {
-                        instance = LLLiveLSLEditor::sInstances[*xored_id];
                         instance->loadScriptText(vfs, asset_id, type);
+                        instance->mAssetStatus = PREVIEW_ASSET_LOADED;
                 }
                 else
                 {
@@ -1488,6 +1578,7 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
                         {
                                 LLNotifyBox::showXml("UnableToLoadScript");
                         }
+                        instance->mAssetStatus = PREVIEW_ASSET_ERROR;
                 }
         }
 
@@ -1496,7 +1587,11 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
 
 void LLLiveLSLEditor::loadScriptText(const char* filename)
 {
-        FILE* file = LLFile::fopen(filename, "rb");
+        if(!filename)
+        {
+                llerrs << "Filename is Empty!" << llendl;
+        }
+        FILE* file = LLFile::fopen(filename, "rb");             /*Flawfinder: ignore*/
         if(file)
         {
                 // read in the whole file
@@ -1522,7 +1617,7 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType
         LLVFile file(vfs, uuid, type);
         S32 file_length = file.getSize();
         char *buffer = new char[file_length + 1];
-        file.read((U8*)buffer, file_length);
+        file.read((U8*)buffer, file_length);            /*Flawfinder: ignore*/
 
         if (file.getLastBytesRead() != file_length ||
                 file_length <= 0)
@@ -1680,18 +1775,16 @@ void LLLiveLSLEditor::saveIfNeeded()
         // set up the save on the local machine.
         mScriptEd->mEditor->makePristine();
         LLTransactionID tid;
-        LLAssetID uuid;
         tid.generate();
-        uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-        mItem->setAssetUUID(uuid);
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string filename = llformat("%s.lsl", filepath.c_str());
+
+        mItem->setAssetUUID(asset_id);
         mItem->setTransactionID(tid);
 
         // write out the data, and store it in the asset database
-        char uuid_string[UUID_STR_LENGTH];
-        uuid.toString(uuid_string);
-        char filename[LL_MAX_PATH];
-        sprintf(filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        FILE* fp = LLFile::fopen(filename, "wb");
+        FILE* fp = LLFile::fopen(filename.c_str(), "wb");
         if(!fp)
         {
                 llwarns << "Unable to write to " << filename << llendl;
@@ -1703,65 +1796,71 @@ void LLLiveLSLEditor::saveIfNeeded()
         LLString utf8text = mScriptEd->mEditor->getText();
         fputs(utf8text.c_str(), fp);
         fclose(fp);
-
-        LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(this, "running");
+        fp = NULL;
         
-        // save it out to database
-        if(gAssetStorage)
+        // save it out to asset server
+        std::string url = gAgent.getRegion()->getCapability("UpdateScriptTaskInventory");
+        getWindow()->incBusyCount();
+        mPendingUploads++;
+        BOOL is_running = LLUICtrlFactory::getCheckBoxByName(this, "running")->get();
+        if (!url.empty())
         {
-                // write it out to the vfs for upload
-                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_TEXT, LLVFile::APPEND);
-                S32 size = utf8text.length() + 1;
-
-                file.setMaxSize(size);
-                file.write((U8*)utf8text.c_str(), size);
-
-                getWindow()->incBusyCount();
-                mPendingUploads++;
-                LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectID,
-                                                                                                                mItem,
-                                                                                                                runningCheckbox->get());
-                gAssetStorage->storeAssetData(tid, LLAssetType::AT_LSL_TEXT, &onSaveTextComplete, (void*)data, FALSE);
+                uploadAssetViaCaps(url, filename, mObjectID,
+                                                   mItemID, is_running);
         }
-
-#if LL_WINDOWS
-        // This major hack was inserted because sometimes compilation
-        // would fail because it couldn't open this file... I decided
-        // to make a loop until open was successful. This seems to be
-        // a problem specific to ntfs.
-        fp = NULL;
-        const U32 MAX_TRIES = 20;
-        U32 tries = MAX_TRIES;
-        while((!fp) && --tries)
+        else if (gAssetStorage)
         {
-                ms_sleep(17);
-                fp = LLFile::fopen(filename, "r");
-                if(!fp)
-                {
-                        llwarns << "Trying to open the source file " << filename
-                                        << " again" << llendl;
-                }
-                else
-                {
-                        fclose(fp);
-                }
+                uploadAssetLegacy(filename, object, tid, is_running);
         }
-        fp = NULL;
-#endif
+}
+
+void LLLiveLSLEditor::uploadAssetViaCaps(const std::string& url,
+                                                                                 const std::string& filename,
+                                                                                 const LLUUID& task_id,
+                                                                                 const LLUUID& item_id,
+                                                                                 BOOL is_running)
+{
+        llinfos << "Update Task Inventory via capability" << llendl;
+        LLSD body;
+        body["task_id"] = task_id;
+        body["item_id"] = item_id;
+        body["is_script_running"] = is_running;
+        LLHTTPClient::post(url, body,
+                new LLUpdateTaskInventoryResponder(body, filename));
+}
+
+void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
+                                                                                LLViewerObject* object,
+                                                                                const LLTransactionID& tid,
+                                                                                BOOL is_running)
+{
+        LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectID,
+                                                                                                        mItem,
+                                                                                                        is_running);
+        gAssetStorage->storeAssetData(filename.c_str(), tid,
+                                                                  LLAssetType::AT_LSL_TEXT,
+                                                                  &onSaveTextComplete,
+                                                                  (void*)data,
+                                                                  FALSE);
+
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        std::string err_filename = llformat("%s.out", filepath.c_str());
 
-        char dst_filename[LL_MAX_PATH];
-        sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        char err_filename[LL_MAX_PATH];
-        sprintf(err_filename, "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
         LLScrollListItem* item = NULL;
         const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
-        if(!lscript_compile(filename, dst_filename, err_filename, gAgent.isGodlike()))
+        FILE *fp;
+        if(!lscript_compile(filename.c_str(),
+                                                dst_filename.c_str(),
+                                                err_filename.c_str(),
+                                                gAgent.isGodlike()))
         {
                 // load the error file into the error scrolllist
                 llinfos << "Compile failed!" << llendl;
-                if(NULL != (fp = LLFile::fopen(err_filename, "r")))
+                if(NULL != (fp = LLFile::fopen(err_filename.c_str(), "r")))
                 {
-                        char buffer[MAX_STRING];
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                         LLString line;
                         while(!feof(fp)) 
                         {
@@ -1801,33 +1900,14 @@ void LLLiveLSLEditor::saveIfNeeded()
                 {
                         llinfos << "LLLiveLSLEditor::saveAsset "
                                         << mItem->getAssetUUID() << llendl;
-
-                        // move the compiled file into the vfs for transport
-                        FILE* fp = LLFile::fopen(dst_filename, "rb");
-                        LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_BYTECODE, LLVFile::APPEND);
-
-                        fseek(fp, 0, SEEK_END);
-                        S32 size = ftell(fp);
-                        fseek(fp, 0, SEEK_SET);
-
-                        file.setMaxSize(size);
-
-                        const S32 buf_size = 65536;
-                        U8 copy_buf[buf_size];
-                        while ((size = fread(copy_buf, 1, buf_size, fp)))
-                        {
-                                file.write(copy_buf, size);
-                        }
-                        fclose(fp);
-                        fp = NULL;
-
                         getWindow()->incBusyCount();
                         mPendingUploads++;
                         LLLiveLSLSaveData* data = NULL;
                         data = new LLLiveLSLSaveData(mObjectID,
                                                                                  mItem,
-                                                                                 runningCheckbox->get());
-                        gAssetStorage->storeAssetData(tid,
+                                                                                 is_running);
+                        gAssetStorage->storeAssetData(dst_filename.c_str(),
+                                                                                  tid,
                                                                                   LLAssetType::AT_LSL_BYTECODE,
                                                                                   &LLLiveLSLEditor::onSaveBytecodeComplete,
                                                                                   (void*)data);
@@ -1836,11 +1916,12 @@ void LLLiveLSLEditor::saveIfNeeded()
         }
 
         // get rid of any temp files left lying around
-        LLFile::remove(filename);
-        LLFile::remove(err_filename);
-        LLFile::remove(dst_filename);
+        LLFile::remove(filename.c_str());
+        LLFile::remove(err_filename.c_str());
+        LLFile::remove(dst_filename.c_str());
 
         // If we successfully saved it, then we should be able to check/uncheck the running box!
+        LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(this, "running");
         runningCheckbox->setLabel(ENABLED_RUNNING_CHECKBOX_LABEL);
         runningCheckbox->setEnabled(TRUE);
 }
@@ -1916,13 +1997,10 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
                 args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
                 gViewerWindow->alertXml("CompileQueueSaveBytecode", args);
         }
-        char uuid_string[UUID_STR_LENGTH];
-        data->mItem->getAssetUUID().toString(uuid_string);
-        char dst_filename[LL_MAX_PATH];
-        sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        LLFile::remove(dst_filename);
-        sprintf(dst_filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        LLFile::remove(dst_filename);
+
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_uuid.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        LLFile::remove(dst_filename.c_str());
         delete data;
 }
 
@@ -1931,6 +2009,16 @@ BOOL LLLiveLSLEditor::canClose()
         return (mScriptEd->canClose());
 }
 
+void LLLiveLSLEditor::closeIfNeeded()
+{
+        getWindow()->decBusyCount();
+        mPendingUploads--;
+        if (mPendingUploads <= 0 && mCloseAfterSave)
+        {
+                close();
+        }
+}
+
 // static
 void LLLiveLSLEditor::onLoad(void* userdata)
 {
@@ -1955,7 +2043,7 @@ LLLiveLSLEditor* LLLiveLSLEditor::show(const LLUUID& script_id, const LLUUID& ob
         {
                 // Move the existing view to the front
                 instance = LLLiveLSLEditor::sInstances[xored_id];
-                instance->open();
+                instance->open();               /*Flawfinder: ignore*/
         }
         return instance;
 }
@@ -1974,6 +2062,13 @@ void LLLiveLSLEditor::hide(const LLUUID& script_id, const LLUUID& object_id)
                 delete instance;
         }
 }
+// static
+LLLiveLSLEditor* LLLiveLSLEditor::find(const LLUUID& script_id, const LLUUID& object_id)
+{
+        LLUUID xored_id = script_id ^ object_id;
+        return sInstances.getIfThere(xored_id);
+}
+
 
 // static
 void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)