Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to reenable the script and notecard editors when we get errors

Browse Source
This commit is contained in:
Lirusaito
2019-04-05 04:08:27 -04:00
parent 6a114ae027
commit f137502020
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llassetuploadresponders.cpp
View File

@@ -223,6 +223,27 @@ LLAssetUploadResponder::~LLAssetUploadResponder()
} }
} }
void on_failure(const LLAssetType::EType& mAssetType, const LLSD& mPostData, const LLSD& args)
{
switch (mAssetType)
{
case LLAssetType::AT_NOTECARD:
{
if (LLPreviewNotecard* nc = (LLPreviewNotecard*)LLPreview::find(mPostData["item_id"]))
nc->setEnabled(true);
break;
}
case LLAssetType::AT_SCRIPT:
case LLAssetType::AT_LSL_TEXT:
case LLAssetType::AT_LSL_BYTECODE:
{
if (LLPreviewLSL* lsl = (LLPreviewLSL*)LLPreview::find(mPostData["item_id"]))
lsl->callbackLSLCompileFailed(LLSD().with(0, "Upload Failure:").with(1, args["REASON"]));
break;
}
default: break;
}
}
// virtual // virtual
void LLAssetUploadResponder::httpFailure() void LLAssetUploadResponder::httpFailure()
{ {
@@ -245,6 +266,7 @@ void LLAssetUploadResponder::httpFailure()
LLNotificationsUtil::add("CannotUploadReason", args); LLNotificationsUtil::add("CannotUploadReason", args);
break; break;
} }
on_failure(mAssetType, mPostData, args);
LLUploadDialog::modalUploadFinished(); LLUploadDialog::modalUploadFinished();
} }
@@ -313,6 +335,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
args["FILE"] = (mFileName.empty() ? mVFileID.asString() : mFileName); args["FILE"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
args["REASON"] = content["message"].asString(); args["REASON"] = content["message"].asString();
LLNotificationsUtil::add("CannotUploadReason", args); LLNotificationsUtil::add("CannotUploadReason", args);
on_failure(mAssetType, mPostData, args);
} }
} }