From d08d018323272866b189979d0e772d50cdece4b2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 27 Oct 2011 13:39:19 -0700
Subject: moved zoom factor management to llviewermediaimpl

---
 indra/newview/llviewermedia.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

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 );
 	}
 }
-- 
cgit v1.2.3