diff options
| author | Rider Linden <rider@lindenlab.com> | 2026-03-26 14:20:52 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2026-03-26 14:20:52 -0700 |
| commit | b194750f29398c900adfc8463dbf85b90e445ebb (patch) | |
| tree | a2d1c27318456209b89bad069e9921b93b830260 | |
| parent | b45bb3186fa28bd2ebbdf8e328f3e239ee5eb4d8 (diff) | |
Some followup CR changes.
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 14bd7db617..416b5efccb 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1535,14 +1535,7 @@ bool LLInventoryCategory::importLegacyStream(std::istream& input_stream) { setFavorite(false); } - if (metadata.has("script") && metadata["script"].has("runtime")) - { - setRuntime(metadata["script"]["runtime"].asString()); - } - else - { - setRuntime(std::string()); - } + setRuntime(std::string()); } else diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 536ee73d5e..31909116c7 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -2739,8 +2739,9 @@ void LLLiveLSLEditor::onCompileTargetChanged() { mScriptEd->mCompileTarget->setEnabled(have_script_upload_cap(mObjectUUID)); mScriptEd->enableSave(getIsModifiable()); - - mScriptEd->processKeywords(mScriptEd->mCompileTarget->getValue().asString() == "luau"); + bool is_lua = mScriptEd->mCompileTarget->getValue().asString() == "luau"; + mScriptEd->mEditor->setLuauLanguage(is_lua); + mScriptEd->processKeywords(is_lua); } void LLLiveLSLEditor::setAssociatedExperience( LLHandle<LLLiveLSLEditor> editor, const LLSD& experience ) |