diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-24 19:48:25 +0300 |
commit | 1bcc4e7f709bf7067121b5891f3f7db3b99235a0 (patch) | |
tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/llimage/llimagej2c.cpp | |
parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
parent | 428f21cf795f440f69a772b314f877ea0c6d4741 (diff) |
Merge pull request #1313 from secondlife/marchcat/x-merge
Release (Maint YZ) -> Maint X merge
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
-rw-r--r-- | indra/llimage/llimagej2c.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 8dba1641a6..68598589b8 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -48,7 +48,7 @@ std::string LLImageJ2C::getEngineInfo() { // All known LLImageJ2CImpl implementation subclasses are cheap to // construct. - boost::scoped_ptr<LLImageJ2CImpl> impl(fallbackCreateLLImageJ2CImpl()); + std::unique_ptr<LLImageJ2CImpl> impl(fallbackCreateLLImageJ2CImpl()); return impl->getEngineInfo(); } |