diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-03 22:59:50 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-03 22:59:50 +0200 |
| commit | 2f4902967ad44c7ca670da11ee05daf8c43a895c (patch) | |
| tree | 33774283dfda5f7f594d64ba3800e3f21947f25e /indra/llui | |
| parent | c5fcf3066f4a5c75635c774422ff1db59b8624f7 (diff) | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
Merge branch 'xcode-14.1' into andreyk/SL-19134
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 7c381161c9..d736aa6634 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -337,7 +337,7 @@ void LLNotificationForm::addElement(const std::string& type, const std::string& element["name"] = name; element["text"] = name; element["value"] = value; - element["index"] = mFormData.size(); + element["index"] = LLSD::Integer(mFormData.size()); element["enabled"] = enabled; mFormData.append(element); } |