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/newview/llcompilequeue.cpp | |
parent | cadc1a02cc7289dabd368dd1a1d237c042e9f82e (diff) | |
parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
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), |