From 343562889e2b9332942f1c190e0dd6b7ddcb9540 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 25 Oct 2011 19:34:05 -0700
Subject: EXP-1471 WIP Add support for zooming web pages by a scale facxtor

---
 indra/newview/llviewermedia.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 0b69b8f0c1..a475d03542 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -250,6 +250,7 @@ public:
 	std::string getMediaEntryURL() { return mMediaEntryURL; }
 	void setHomeURL(const std::string& home_url, const std::string& mime_type = LLStringUtil::null) { mHomeURL = home_url; mHomeMimeType = mime_type;};
 	void clearCache();
+	void setPageZoomFactor( double factor );
 	std::string getMimeType() { return mMimeType; }
 	void scaleMouse(S32 *mouse_x, S32 *mouse_y);
 	void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y);
-- 
cgit v1.2.3


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.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index a475d03542..3db9f0b4e0 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -417,6 +417,7 @@ private:
 private:
 	// a single media url with some data and an impl.
 	LLPluginClassMedia* mMediaSource;
+	F64		mZoomFactor;
 	LLUUID mTextureId;
 	bool  mMovieImageHasMips;
 	std::string mMediaURL;			// The last media url set with NavigateTo
-- 
cgit v1.2.3