diff options
author | Brad Linden <brad@lindenlab.com> | 2024-04-24 09:55:34 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-04-24 09:55:34 -0700 |
commit | 86c0c1d5536897c925f4e8aa2859a160313d964c (patch) | |
tree | 9d32be1b0d6a4dd139d8a72b35a94f48046b2ffc /indra/llimage/llimagej2c.h | |
parent | cadc1a02cc7289dabd368dd1a1d237c042e9f82e (diff) | |
parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
Diffstat (limited to 'indra/llimage/llimagej2c.h')
-rw-r--r-- | indra/llimage/llimagej2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h index e196f7479e..b30df6f776 100644 --- a/indra/llimage/llimagej2c.h +++ b/indra/llimage/llimagej2c.h @@ -95,7 +95,7 @@ protected: S8 mRawDiscardLevel; F32 mRate; bool mReversible; - boost::scoped_ptr<LLImageJ2CImpl> mImpl; + std::unique_ptr<LLImageJ2CImpl> mImpl; std::string mLastError; // Image compression/decompression tester |