summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-27 13:39:19 -0700
committerRichard Linden <none@none>2011-10-27 13:39:19 -0700
commitd08d018323272866b189979d0e772d50cdece4b2 (patch)
tree8be3ab9be9718ede73645f225be7fa0c2c2551a1 /indra/newview/llviewermedia.cpp
parent40dcdac27ae5d11a6e3d6a13b1505e834f672e4d (diff)
moved zoom factor management to llviewermediaimpl
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index fdb281b7f1..dfad871dd7 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1715,7 +1715,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.
@@ -2305,8 +2306,9 @@ void LLViewerMediaImpl::clearCache()
//////////////////////////////////////////////////////////////////////////////////////////
void LLViewerMediaImpl::setPageZoomFactor( double factor )
{
- if(mMediaSource)
+ if(mMediaSource && factor != mZoomFactor)
{
+ mZoomFactor = factor;
mMediaSource->set_page_zoom_factor( factor );
}
}