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/newview/llcompilequeue.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/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 320806d78d..a3dcea5410 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -74,7 +74,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), |