Merge develop into develop-linux

Merge pull request #5316 from RyeMutt/rye/devlinuxupdate

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp
index 9abca48670..acd4bafb85 100644
--- a/indra/llcommon/llsdjson.cpp
+++ b/indra/llcommon/llsdjson.cpp
@@ -64,7 +64,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();
         }
@@ -78,7 +78,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;
     }