diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 10:50:02 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 10:50:02 -0700 |
commit | 54672c8f14e8ba90e0362fd7ebb8febcebeb03e6 (patch) | |
tree | 8be166c54f4f4a3640ad59717f338ce122ca5da1 /indra/newview/llviewermedia.h | |
parent | 2e2347d6ecb06cf4b125d625d238dfe8b9f181a4 (diff) | |
parent | 2c3fc19aac83b92651cc058126aff0ba66d1ad3c (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 0b69b8f0c1..3db9f0b4e0 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); @@ -416,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 |