Merge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.02

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp
index a4b45ed80d..71f35802c5 100644
--- a/indra/llcommon/llsdjson.cpp
+++ b/indra/llcommon/llsdjson.cpp
@@ -70,7 +70,7 @@ LLSD LlsdFromJson(const boost::json::value& val)
         const boost::json::array& array = val.as_array();
         size_t size = array.size();
         // allocate elements 0 .. (size() - 1) to avoid incremental allocation
-        if (! array.empty())
+        if (!array.empty())
         {
             result[size - 1] = LLSD();
         }
@@ -84,7 +84,7 @@ LLSD LlsdFromJson(const boost::json::value& val)
         result = LLSD::emptyMap();
         for (const auto& element : val.as_object())
         {
-            result[element.key()] = LlsdFromJson(element.value());
+            result[std::string_view(element.key())] = LlsdFromJson(element.value());
         }
         break;
     }