diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-09-10 15:53:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 15:53:59 -0400 |
| commit | 5b97823db6f7cec6569ef893499cf48f4a889e67 (patch) | |
| tree | 79f368f096ba2c72a98627671c713a0a8abf332f /indra/newview/llmaterialeditor.cpp | |
| parent | 175400230869963df7a3f126122ace14456c56cb (diff) | |
| parent | dd1113ba2b62b24378e5b8ecfee0093474527c5a (diff) | |
Merge pull request #4636 from secondlife/project/mac_universal
Apple Silicon Support
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 3e5d6d1171..cac72bb085 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -63,8 +63,9 @@ #include "tinygltf/tiny_gltf.h" #include "lltinygltfhelper.h" -#include <strstream> +#include <boost/iostreams/device/array.hpp> +#include <boost/iostreams/stream.hpp> const std::string MATERIAL_BASE_COLOR_DEFAULT_NAME = "Base Color"; const std::string MATERIAL_NORMAL_DEFAULT_NAME = "Normal"; @@ -1246,7 +1247,7 @@ bool LLMaterialEditor::decodeAsset(const std::vector<char>& buffer) { LLSD asset; - std::istrstream str(&buffer[0], buffer.size()); + boost::iostreams::stream<boost::iostreams::array_source> str(buffer.data(), buffer.size()); if (LLSDSerialize::deserialize(asset, str, buffer.size())) { if (asset.has("version") && LLGLTFMaterial::isAcceptedVersion(asset["version"].asString())) |