diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-08-25 12:56:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-25 12:56:22 -0400 |
| commit | 2e9c387fee881022aec13d5c85f901539683c18f (patch) | |
| tree | d2cc89444771d96871b3126c9462f072dc059e32 /indra/newview/llcommandlineparser.cpp | |
| parent | 92289533c1b95bc0fb2cdcc1217ae539485ea244 (diff) | |
| parent | a402fd4da91bbce03340e174505c06feede65866 (diff) | |
Merge branch 'develop' into project/lua_editor
Diffstat (limited to 'indra/newview/llcommandlineparser.cpp')
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 0734b12531..84d3ff90d5 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -611,6 +611,11 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value, ctrl->setValue(llsdArray, false); } + else if (ctrl->isType(TYPE_LLSD)) + { + // Command-line LLSD should support a notation format string + ctrl->setValueFromNotation(onevalue(option, value), false); + } else { ctrl->setValue(onevalue(option, value), false); |