diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
| commit | 48b34e07ef33965edcc38006082be01ed7ed239d (patch) | |
| tree | dc236a74a900921ab1fae039f655f1cb9aca7b6c /indra/newview/llmaterialeditor.cpp | |
| parent | 689f723a5f314ffa0f54c0e50a51cbe464b36ccf (diff) | |
| parent | 002a81ccf5a64fd08e29811a6edea36f2e0408be (diff) | |
Merge branch 'develop' into rlva/base
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 dde238eddb..b5e494379d 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"; @@ -1245,7 +1246,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())) |