diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
| commit | 353f7ea61873d9f35685a59b4102899b4a9e596e (patch) | |
| tree | 3ca2964682d7e5e23b7a178a854c567c7c5384d9 /indra/newview/llviewermedia.cpp | |
| parent | 139c13bdc0387f50d9f3a71737a95a4585bc471c (diff) | |
| parent | 334d8f4076b4045e8fd4ede5fd9d31f0b185ded4 (diff) | |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 41b4dc01e8..f616262523 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1716,7 +1716,8 @@ LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, mNavigateSuspended(false), mNavigateSuspendedDeferred(false), mIsUpdated(false), - mTrustedBrowser(false) + mTrustedBrowser(false), + mZoomFactor(1.0) { // Set up the mute list observer if it hasn't been set up already. @@ -2302,6 +2303,17 @@ void LLViewerMediaImpl::clearCache() } } + +////////////////////////////////////////////////////////////////////////////////////////// +void LLViewerMediaImpl::setPageZoomFactor( double factor ) +{ + if(mMediaSource && factor != mZoomFactor) + { + mZoomFactor = factor; + mMediaSource->set_page_zoom_factor( factor ); + } +} + ////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::mouseDown(S32 x, S32 y, MASK mask, S32 button) { |