diff options
| author | leviathan <leviathan@lindenlab.com> | 2024-09-03 15:38:35 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew.l.meadows@gmail.com> | 2024-10-03 09:16:46 -0700 |
| commit | 0617923ae7f450ece7288f8a73446c45a8ed32db (patch) | |
| tree | 1914627e41be3619eb335aa28e6acdfb98925ea0 /indra/llcommon | |
| parent | 8213a0fb6b3149042d6833c8f0c4a3c1bfdc8bc9 (diff) | |
remove crashy LLSD ctor used by GameControl
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsd.h | 14 | ||||
| -rw-r--r-- | indra/llcommon/llstring.h | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index 7fa193e035..e018b400cb 100644 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -335,20 +335,6 @@ public: { return c ? (*this)[std::string_view(c)] : *this; } - - template<typename T> - LLSD(const std::map<String, T>& map, bool exclude_empty = false) - { - assign(emptyMap()); - for (const std::pair<String, T>& pair : map) - { - LLSD value(pair.second); - if (!exclude_empty || !value.isEmpty()) - { - insert(pair.first, value); - } - } - } //@} /** @name Array Values */ diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 7d0806b22e..b15a85cb2a 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -36,6 +36,7 @@ //#include <locale> #include <iomanip> #include <algorithm> +#include <functional> #include <vector> #include <map> #include <type_traits> |