diff options
author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
---|---|---|
committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
commit | bcb5336958e30bf56b2f327235c3731407b34530 (patch) | |
tree | 384c333370a24fca38c77b0cd72f195a1a0ce882 /indra/llplugin/llpluginclassmedia.h | |
parent | a28a3b756d7688fcb917122efee01f16ab5319cd (diff) | |
parent | 5219e6c455c92d789c25909d02bf094886fad3d9 (diff) |
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613)
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 |
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; |