diff options
| author | Rye Cogtail <rye@lindenlab.com> | 2024-09-30 23:17:59 -0400 |
|---|---|---|
| committer | Rye Cogtail <rye@lindenlab.com> | 2024-09-30 23:17:59 -0400 |
| commit | e22af7cef9868e90f09930f2bffb457d79ac2d23 (patch) | |
| tree | 3a5f484caa7e7031cf66e3fc4462630902437694 /indra/newview/llmaterialeditor.cpp | |
| parent | 5112aa396db2b3eac15970f65b9c5fb149fd8ce1 (diff) | |
Fix deprecated strstream usage with boost::iostream::array_source
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())) |