diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-27 21:10:46 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-27 21:10:46 +0300 |
| commit | 97c372047c14ce9966a41744c15b79d27ce8fba4 (patch) | |
| tree | c76f295a414ebcfae6e64f85d7ff9d1467e7067d /indra/newview/llviewermedia.h | |
| parent | 5828d061144fe1d15580dc6f9e00d7dcf93456ea (diff) | |
| parent | 07e78807a8b3657ee2303dc22187d858cf8be625 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index db07f4115b..5c876861c4 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -302,7 +302,7 @@ public: void setTarget(const std::string& target) { mTarget = target; } // utility function to create a ready-to-use media instance from a desired media type. - static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height, const std::string target = LLStringUtil::null, bool clean_browser = false); + static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height, F64 zoom_factor, const std::string target = LLStringUtil::null, bool clean_browser = false); // Internally set our desired browser user agent string, including // the Second Life version and skin name. Used because we can |