summaryrefslogtreecommitdiff
path: root/indra/newview/llcompilequeue.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-02-05 22:09:54 +0200
committerGitHub <noreply@github.com>2024-02-05 22:09:54 +0200
commit9f0faf5c892bba9703c713a29202a8ac48bfdf8b (patch)
tree8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/newview/llcompilequeue.cpp
parentaa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff)
parente3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (diff)
Merge pull request #735 from secondlife/marchcat/yz-merge
Merge Maint Z into Maint YZ
Diffstat (limited to 'indra/newview/llcompilequeue.cpp')
-rw-r--r--indra/newview/llcompilequeue.cpp2
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),