diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:36 +0300 |
| commit | 3c833ce035c87e0f03ec8e46894d10adb33ad820 (patch) | |
| tree | f2ee6c215244bdea45440b1a753c83d19eace121 /indra/newview/llcompilequeue.cpp | |
| parent | ea4ddb5f40ee8dd253be0ac4229de90f1eef61a3 (diff) | |
| parent | 3713c33098ab98d840c0ed20bcbb5a1cb8e15235 (diff) | |
Merge pull request #1314 from secondlife/marchcat/b-merge
Release (Maint YZ) -> Maint B merge
Diffstat (limited to 'indra/newview/llcompilequeue.cpp')
| -rw-r--r-- | indra/newview/llcompilequeue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index eb2c156ca5..b11786a451 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -73,7 +73,7 @@ namespace class ObjectInventoryFetcher: public LLVOInventoryListener { public: - typedef boost::shared_ptr<ObjectInventoryFetcher> ptr_t; + typedef std::shared_ptr<ObjectInventoryFetcher> ptr_t; ObjectInventoryFetcher(LLEventPump &pump, LLViewerObject* object, void* user_data) : mPump(pump), |