summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagej2c.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-24 19:53:29 +0300
committerGitHub <noreply@github.com>2024-04-24 19:53:29 +0300
commite5b14e4c2ceac66cd1083c497f4bc4edc4e43436 (patch)
treefa37803eb1815775a10c86264c643a932a87fca9 /indra/llimage/llimagej2c.cpp
parentb1b2ae00cad6c624ae3ce45bd27bc07f48ce70dd (diff)
parent195a6c56f4899790c5016b5d5b8cb701134a514f (diff)
Merge pull request #1315 from secondlife/marchcat/c-merge
Release (Maint YZ) -> Maint C merge
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
-rw-r--r--indra/llimage/llimagej2c.cpp2
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();
}