diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
| commit | 7021288859036789dc268233cc1a3401d6082721 (patch) | |
| tree | 2d6a4d9e87785a8bc236215e5e0102a553a0ee5f /indra/newview/llmediactrl.cpp | |
| parent | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (diff) | |
| parent | 19bc1ee671df2f89d990dfe8aadea1d9ea424e82 (diff) | |
Pull in viewer-lion to cut off DRTVWR-373
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rwxr-xr-x | indra/newview/llmediactrl.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 086bc1c186..f4e08dc790 100755 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -509,6 +509,16 @@ void LLMediaCtrl::navigateForward() //////////////////////////////////////////////////////////////////////////////// // +void LLMediaCtrl::navigateStop() +{ + if (mMediaSource && mMediaSource->hasMedia()) + { + mMediaSource->getMediaPlugin()->browse_stop(); + } +} + +//////////////////////////////////////////////////////////////////////////////// +// bool LLMediaCtrl::canNavigateBack() { if (mMediaSource) |