From b33d4053eca36480098f764c7b7ad8f3516641ea Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 18 Aug 2026 00:30:13 +0300
Subject: #1841 Fix viewer attempting to parse joystick key string into an llsd

Key already is an LLSD::String and needs no further parsing.
This parsing was added for command line handling and should be done
explicitly in command line's parser. Also extended event listeners,
there should be no ambiguity in what kind of data we are passing.
---
 indra/newview/llcommandlineparser.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llcommandlineparser.cpp')

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);
-- 
cgit v1.3