diff options
| author | Vir Linden <60274682+vir-linden@users.noreply.github.com> | 2024-04-24 16:02:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 16:02:42 -0400 |
| commit | a3602d660c89a10126946d9c789e454fbfbc34bd (patch) | |
| tree | 1cd70015b45a432f599036f181dd93c53c59393a /indra/llplugin/llpluginclassmedia.h | |
| parent | 6ca4dfdb56d0107368a09af2b089c24d32e7108d (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge pull request #1323 from secondlife/main
Update from main
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index ba76ae4e37..d56712257b 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -335,7 +335,7 @@ public: // "init_history" message void initializeUrlHistory(const LLSD& url_history); - boost::shared_ptr<LLPluginClassMedia> getSharedPtr() { return boost::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this + std::shared_ptr<LLPluginClassMedia> getSharedPtr() { return std::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this protected: |