diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-04-17 19:25:28 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-04-17 19:25:28 +0300 |
| commit | 5219e6c455c92d789c25909d02bf094886fad3d9 (patch) | |
| tree | c0ecca488f307f2a957363b0bae3664248bcce3d /indra/newview/llviewermedia.h | |
| parent | 1892d7e5cfe6ec84f83b655088c8d80c9b88d592 (diff) | |
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 6e18c4fecb..c52960dfcf 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -202,7 +202,7 @@ public: bool initializeMedia(const std::string& mime_type); bool initializePlugin(const std::string& media_type); void loadURI(); - LLPluginClassMedia* getMediaPlugin() { return mMediaSource; } + LLPluginClassMedia* getMediaPlugin() { return mMediaSource.get(); } void setSize(int width, int height); void showNotification(LLNotificationPtr notify); @@ -417,7 +417,7 @@ private: private: // a single media url with some data and an impl. - LLPluginClassMedia* mMediaSource; + boost::shared_ptr<LLPluginClassMedia> mMediaSource; F64 mZoomFactor; LLUUID mTextureId; bool mMovieImageHasMips; |