diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
| commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llmediadataclient.h | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) | |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A merge
Diffstat (limited to 'indra/newview/llmediadataclient.h')
| -rw-r--r-- | indra/newview/llmediadataclient.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h index cd45825c77..8c4b3cff90 100644 --- a/indra/newview/llmediadataclient.h +++ b/indra/newview/llmediadataclient.h @@ -116,10 +116,10 @@ protected: // Request (pure virtual base class for requests in the queue) class Request: - public boost::enable_shared_from_this<Request> + public std::enable_shared_from_this<Request> { public: - typedef boost::shared_ptr<Request> ptr_t; + typedef std::shared_ptr<Request> ptr_t; // Subclasses must implement this to build a payload for their request type. virtual LLSD getPayload() const = 0; |