summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-21 18:40:18 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-21 18:40:18 +0100
commit2c0583a2719faabd32415782e2326858e0557d0e (patch)
tree50a5845ebd39fba7bb428d145404de85ed30e499 /indra/llplugin
parent91121d113d25af570ec64564dd10c21f0d5fcb69 (diff)
parentea75559674a8ac6d48fbf511880b1a79cbb7642d (diff)
Merge 5.1.7
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 3b3075c6bd..4f52afb317 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -317,6 +317,8 @@ 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
+
protected:
LLPluginClassMediaOwner *mOwner;