diff options
author | Nicky <nicky.dasmijn@gmail.com> | 2022-05-07 18:10:29 +0200 |
---|---|---|
committer | Nicky <nicky.dasmijn@gmail.com> | 2022-05-07 18:10:29 +0200 |
commit | 62053e1e889b6a320d7c024cc028caa6de89ea91 (patch) | |
tree | 6693bfd9be291a2af9d20521a4337f1e06581625 /indra/llplugin | |
parent | 42820f834fcd68c40dc71f1be2a2b7d50096f148 (diff) | |
parent | 43a338c6270f9a000052465d09d4ad999524af0b (diff) |
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
Diffstat (limited to 'indra/llplugin')
-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 adbb93f789..ba76ae4e37 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> getSharedPrt() { return boost::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this + boost::shared_ptr<LLPluginClassMedia> getSharedPtr() { return boost::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this protected: |