diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-02-12 17:18:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-12 17:18:31 +0200 |
| commit | 23ac8f603ea2e590b47598edf0fd6824f168fc0b (patch) | |
| tree | c3d9eb897785b59e30fd53adb8b511767f158881 /indra/newview/llviewerassetupload.cpp | |
| parent | 5029f0322f264e17f7509952f7bf9812db17a9ec (diff) | |
| parent | ad7dee8aa08bb6207f95a50c8d1eeb55e8e0d81e (diff) | |
Merge pull request #3535 from secondlife/marchcat/lua_editor
Lua editor: initial PR to start the project viewer
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index 7ef2c8d697..1784179237 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -804,16 +804,16 @@ bool LLBufferedAssetUploadInfo::failedUpload(LLSD &result, std::string &reason) LLScriptAssetUpload::LLScriptAssetUpload(LLUUID itemId, std::string buffer, invnUploadFinish_f finish, uploadFailed_f failed): LLBufferedAssetUploadInfo(itemId, LLAssetType::AT_LSL_TEXT, buffer, finish, failed), mExerienceId(), - mTargetType(MONO), + mCompileTarget("mono"), mIsRunning(false) { } -LLScriptAssetUpload::LLScriptAssetUpload(LLUUID taskId, LLUUID itemId, TargetType_t targetType, +LLScriptAssetUpload::LLScriptAssetUpload(LLUUID taskId, LLUUID itemId, std::string compileTarget, bool isRunning, LLUUID exerienceId, std::string buffer, taskUploadFinish_f finish, uploadFailed_f failed): LLBufferedAssetUploadInfo(taskId, itemId, LLAssetType::AT_LSL_TEXT, buffer, finish, failed), mExerienceId(exerienceId), - mTargetType(targetType), + mCompileTarget(compileTarget), mIsRunning(isRunning) { } @@ -832,7 +832,7 @@ LLSD LLScriptAssetUpload::generatePostBody() body["task_id"] = getTaskId(); body["item_id"] = getItemId(); body["is_script_running"] = getIsRunning(); - body["target"] = (getTargetType() == MONO) ? "mono" : "lsl2"; + body["target"] = getCompileTarget(); body["experience"] = getExerienceId(); } |