summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-03-12 14:34:25 -0800
committerCallum Prentice <callum@lindenlab.com>2010-03-12 14:34:25 -0800
commitd5e685306ce100a62db06a36dfef58f3beb22b7a (patch)
tree4edf13210302a08dd6da9f2bdf3f0218d9734c5a /indra/llplugin/llpluginclassmedia.h
parent6079a50186923cd764474e94d70da89074d0a7ab (diff)
(for B5) Fix for EXT-5823 "Include language in user-agent string" (implemented via JavaScript - not in ua string)
(for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry" Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r--indra/llplugin/llpluginclassmedia.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 58e91fa0b4..ce49241e84 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -49,7 +49,11 @@ public:
virtual ~LLPluginClassMedia();
// local initialization, called by the media manager when creating a source
- virtual bool init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path);
+ virtual bool init(const std::string &launcher_filename,
+ const std::string &plugin_filename,
+ bool debug,
+ const std::string &user_data_path,
+ const std::string &language_code);
// undoes everything init() didm called by the media manager when destroying a source
virtual void reset();